ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

made use of defaults in get_or_create

Browse Source
This commit is contained in:
Oskar Hahn 2012-11-22 18:47:50 +01:00
parent 1049141483
commit fa1c384d28
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/participant/forms.py
View File

@ -28,10 +28,8 @@ class UserCreateForm(forms.ModelForm, CssClassMixin):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
if kwargs.get('instance', None) is None: if kwargs.get('instance', None) is None:
initial = kwargs.setdefault('initial', {}) initial = kwargs.setdefault('initial', {})
registered, created = Group.objects.get_or_create(name__iexact='Registered') registered, created = Group.objects.get_or_create(
if created: name__iexact='Registered', defaults={'name': 'Registered'})
registered.name = 'Registered'
registered.save()
initial['groups'] = [registered.pk] initial['groups'] = [registered.pk]
super(UserCreateForm, self).__init__(*args, **kwargs) super(UserCreateForm, self).__init__(*args, **kwargs)

6
openslides/participant/models.py
View File

@ -253,9 +253,7 @@ def djangogroup_post_save(sender, instance, signal, *args, **kwargs):
def user_post_save(sender, instance, *args, **kwargs): def user_post_save(sender, instance, *args, **kwargs):
if not kwargs['created']: if not kwargs['created']:
return return
registered, created = Group.objects.get_or_create(name__iexact='Registered') registered, created = Group.objects.get_or_create(
if created: name__iexact='Registered', defaults={'name': 'Registered'})
registered.name = 'Registered'
registered.save()
instance.groups.add(registered) instance.groups.add(registered)
instance.save() instance.save()