Browse Source

Fix #1725 Corrigido-save-dos-roles-no-create'

git commit -m Fix
pull/1740/head
tapumar@gmail.com 8 years ago
parent
commit
b42285fe09
  1. 7
      sapl/base/forms.py
  2. 4
      sapl/base/views.py

7
sapl/base/forms.py

@ -82,6 +82,8 @@ class UsuarioCreateForm(ModelForm):
[('password1', 6), [('password1', 6),
('password2', 6)]) ('password2', 6)])
row4 = to_row([(form_actions(label='Confirmar'), 6)])
self.helper = FormHelper() self.helper = FormHelper()
self.helper.layout = Layout( self.helper.layout = Layout(
row0, row0,
@ -89,8 +91,7 @@ class UsuarioCreateForm(ModelForm):
row3, row3,
row2, row2,
'roles', 'roles',
form_actions(label='Confirmar')) row4)
class UsuarioEditForm(ModelForm): class UsuarioEditForm(ModelForm):
ROLES = [(g.id, g.name) for g in Group.objects.all().order_by('name')] ROLES = [(g.id, g.name) for g in Group.objects.all().order_by('name')]
@ -98,7 +99,7 @@ class UsuarioEditForm(ModelForm):
password1 = forms.CharField(required=False, widget=forms.PasswordInput, label='Senha') password1 = forms.CharField(required=False, widget=forms.PasswordInput, label='Senha')
password2 = forms.CharField(required=False, widget=forms.PasswordInput, label='Confirmar senha') password2 = forms.CharField(required=False, widget=forms.PasswordInput, label='Confirmar senha')
user_active = forms.ChoiceField(choices=YES_NO_CHOICES, required=True, label="Usuário ativo?", initial='True') user_active = forms.ChoiceField(choices=YES_NO_CHOICES, required=True, label="Usuário ativo?", initial='True')
roles = forms.MultipleChoiceField(required=False, widget=forms.CheckboxSelectMultiple(), choices=ROLES) roles = forms.MultipleChoiceField(required=True, widget=forms.CheckboxSelectMultiple(), choices=ROLES)
class Meta: class Meta:
model = get_user_model() model = get_user_model()

4
sapl/base/views.py

@ -563,6 +563,10 @@ class CreateUsuarioView(PermissionRequiredMixin, CreateView):
new_user.is_staff = False new_user.is_staff = False
new_user.save() new_user.save()
groups = Group.objects.filter(id__in=data['roles'])
for g in groups:
g.user_set.add(new_user)
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())
class DeleteUsuarioView(PermissionRequiredMixin, DeleteView): class DeleteUsuarioView(PermissionRequiredMixin, DeleteView):

Loading…
Cancel
Save