Browse Source

Basic admin edit user form.

Rafał Pitoń 11 years ago
parent
commit
52a899a358
3 changed files with 10 additions and 5 deletions
  1. 6 1
      misago/users/forms/admin.py
  2. 2 2
      misago/users/models/usermodel.py
  3. 2 2
      misago/users/views/useradmin.py

+ 6 - 1
misago/users/forms/admin.py

@@ -17,6 +17,10 @@ class UserBaseForm(forms.ModelForm):
     email = forms.EmailField(
         label=_("E-mail address"))
 
+    class Meta:
+        model = get_user_model()
+        fields = ['username', 'email', 'title']
+
     def clean_username(self):
         data = self.cleaned_data['username']
         validate_username(data)
@@ -52,7 +56,7 @@ class NewUserForm(UserBaseForm):
 
     class Meta:
         model = get_user_model()
-        fields = ['username', 'email']
+        fields = ['username', 'email', 'title']
 
 
 class EditUserForm(forms.ModelForm):
@@ -63,6 +67,7 @@ class EditUserForm(forms.ModelForm):
 
     class Meta:
         model = get_user_model()
+        fields = ['username', 'email', 'title']
 
 
 def UserFormFactory(FormType, instance):

+ 2 - 2
misago/users/models/usermodel.py

@@ -180,8 +180,8 @@ class User(AbstractBaseUser, PermissionsMixin):
         return [roles_dict[r] for r in sorted(roles_pks)]
 
     def update_acl_key(self):
-        roles_pks = [r.pk for r in self.get_roles()]
-        self.acl_key = md5(','.join(roles_pks)).hexdigest()
+        roles_pks = [unicode(r.pk) for r in self.get_roles()]
+        self.acl_key = md5(','.join(roles_pks)).hexdigest()[:12]
 
 
 class AnonymousUser(DjangoAnonymousUser):

+ 2 - 2
misago/users/views/useradmin.py

@@ -49,7 +49,7 @@ class NewUser(UserAdmin, generic.ModelFormView):
         if form.cleaned_data.get('roles'):
             new_user.roles.add(*form.cleaned_data['roles'])
 
-        new_user.update_acl_token()
+        new_user.update_acl_key()
         new_user.save()
 
         messages.success(request, self.message_submit % target.username)
@@ -71,7 +71,7 @@ class EditUser(UserAdmin, generic.ModelFormView):
         if form.cleaned_data.get('roles'):
             form.instance.roles.add(*form.cleaned_data['roles'])
 
-        form.instance.update_acl_token()
+        form.instance.update_acl_key()
         form.instance.save()
 
         messages.success(request, self.message_submit % target.username)