|
@ -134,6 +134,7 @@ class UserAdminForm(ModelForm): |
|
|
('groups', 12), |
|
|
('groups', 12), |
|
|
|
|
|
|
|
|
] + ([('user_permissions', 12)] if not self.granular is None else []) |
|
|
] + ([('user_permissions', 12)] if not self.granular is None else []) |
|
|
|
|
|
|
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
self.helper = SaplFormHelper() |
|
|
self.helper = SaplFormHelper() |
|
@ -185,11 +186,15 @@ class UserAdminForm(ModelForm): |
|
|
self.instance.set_password(self.cleaned_data['new_password1']) |
|
|
self.instance.set_password(self.cleaned_data['new_password1']) |
|
|
|
|
|
|
|
|
votante = None |
|
|
votante = None |
|
|
|
|
|
permissions = None |
|
|
if self.instance.id: |
|
|
if self.instance.id: |
|
|
inst_old = get_user_model().objects.get(pk=self.instance.pk) |
|
|
inst_old = get_user_model().objects.get(pk=self.instance.pk) |
|
|
votante = inst_old.groups.filter(name='Votante').first() |
|
|
votante = inst_old.groups.filter(name='Votante').first() |
|
|
autor = inst_old.groups.filter(name='Autor').first() |
|
|
autor = inst_old.groups.filter(name='Autor').first() |
|
|
|
|
|
|
|
|
|
|
|
if self.granular is None: |
|
|
|
|
|
permissions = list(inst_old.user_permissions.all()) |
|
|
|
|
|
|
|
|
inst_new = super().save(commit) |
|
|
inst_new = super().save(commit) |
|
|
|
|
|
|
|
|
if votante: |
|
|
if votante: |
|
@ -198,6 +203,9 @@ class UserAdminForm(ModelForm): |
|
|
if autor: |
|
|
if autor: |
|
|
inst_new.groups.add(autor) |
|
|
inst_new.groups.add(autor) |
|
|
|
|
|
|
|
|
|
|
|
if permissions: |
|
|
|
|
|
inst_new.user_permissions.add(*permissions) |
|
|
|
|
|
|
|
|
return inst_new |
|
|
return inst_new |
|
|
|
|
|
|
|
|
def clean(self): |
|
|
def clean(self): |
|
|