nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed get_group to get_or_create_group

Browse Source
This commit is contained in:
fonfon 2014-09-03 04:52:34 +02:00
parent 7bb9c84863
commit d27c3f69d1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plinth/modules/expert_mode/expert_mode.py
View File

@ -5,7 +5,7 @@ from django.template.response import TemplateResponse
from gettext import gettext as _ from gettext import gettext as _
from plinth import cfg from plinth import cfg
from plinth.modules.lib.auth import get_group from plinth.modules.lib.auth import get_or_create_group
class ExpertsForm(forms.Form): # pylint: disable-msg=W0232 class ExpertsForm(forms.Form): # pylint: disable-msg=W0232
@ -51,7 +51,7 @@ def _apply_changes(request, new_status):
"""Apply expert mode configuration""" """Apply expert mode configuration"""
message = (messages.info, _('Settings unchanged')) message = (messages.info, _('Settings unchanged'))
expert_group = get_group('Expert') expert_group = get_or_create_group('Expert')
if new_status['expert_mode']: if new_status['expert_mode']:
if not expert_group in request.user.groups.all(): if not expert_group in request.user.groups.all():
request.user.groups.add(expert_group) request.user.groups.add(expert_group)

4
plinth/modules/lib/auth.py
View File

@ -15,10 +15,10 @@ def add_user(username, passphrase, name='', email='', expert=False):
user.save() user.save()
if expert: if expert:
user.groups.add(get_group('Expert')) user.groups.add(get_or_create_group('Expert'))
def get_group(name): def get_or_create_group(name):
"""Return an existing or newly created group with given name""" """Return an existing or newly created group with given name"""
try: try:
group = Group.objects.get(name__exact=name) group = Group.objects.get(name__exact=name)