kallithea Changeset - e50a56e61b23

Changeset - e50a56e61b23

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 10 years ago 2015-07-31 15:44:07
madski@unity3d.com

users: avoid unnecessary handling of c.extern_type and c.extern_name when editing users

It is user data as anything else.

4 files changed with 6 insertions and 11 deletions:

kallithea/controllers/admin/my_account.py

kallithea/controllers/admin/users.py

kallithea/templates/admin/my_account/my_account_profile.html

kallithea/templates/admin/users/user_edit_profile.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/my_account.py

➞

Show inline comments

@@ @@ -97,14 +97,12 @@ class MyAccountController(BaseController @@
         """
         # url('my_account')
         c.active = 'profile'
         self.__load_data()
         c.perm_user = AuthUser(user_id=self.authuser.user_id)
         c.ip_addr = self.ip_addr
         c.extern_type = c.user.extern_type
         c.extern_name = c.user.extern_name
         defaults = c.user.get_dict()
         update = False
         if request.POST:
             _form = UserForm(edit=True,
                              old_data={'user_id': self.authuser.user_id,
@@ @@ -116,14 +114,15 @@ class MyAccountController(BaseController @@
                 post_data['password_confirmation'] = ''
                 form_result = _form.to_python(post_data)
                 # skip updating those attrs for my account
                 skip_attrs = ['admin', 'active', 'extern_type', 'extern_name',
                               'new_password', 'password_confirmation']
                 #TODO: plugin should define if username can be updated
                 if c.extern_type != EXTERN_TYPE_INTERNAL:
+                if c.user.extern_type != EXTERN_TYPE_INTERNAL:
                     # forbid updating username for external accounts
                     # TODO: also skip username (and email etc) if self registration not enabled
                     skip_attrs.append('username')
                 UserModel().update(self.authuser.user_id, form_result,
                                    skip_attrs=skip_attrs)
                 h.flash(_('Your account was updated successfully'),
                         category='success')

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -163,24 +163,22 @@ class UsersController(BaseController): @@
         #    h.form(url('update_user', id=ID),
         #           method='put')
         # url('user', id=ID)
         c.active = 'profile'
         user_model = UserModel()
         c.user = user_model.get(id)
         c.extern_type = c.user.extern_type
         c.extern_name = c.user.extern_name
         c.perm_user = AuthUser(user_id=id)
         c.ip_addr = self.ip_addr
         _form = UserForm(edit=True, old_data={'user_id': id,
                                               'email': c.user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             skip_attrs = ['extern_type', 'extern_name']
             #TODO: plugin should define if username can be updated
             if c.extern_type != kallithea.EXTERN_TYPE_INTERNAL:
+            if c.user.extern_type != kallithea.EXTERN_TYPE_INTERNAL:
                 # forbid updating username for external accounts
                 skip_attrs.append('username')
             user_model.update(id, form_result, skip_attrs=skip_attrs)
             usr = form_result['username']
             action_logger(self.authuser, 'admin_updated_user:%s' % usr,
@@ @@ -244,14 +242,12 @@ class UsersController(BaseController): @@
     def edit(self, id, format='html'):
         """GET /users/id/edit: Form to edit an existing item"""
         # url('edit_user', id=ID)
         c.user = self._get_user_or_raise_if_default(id)
         c.active = 'profile'
         c.extern_type = c.user.extern_type
         c.extern_name = c.user.extern_name
         c.perm_user = AuthUser(user_id=id)
         c.ip_addr = self.ip_addr
         defaults = c.user.get_dict()
         return htmlfill.render(
             render('admin/users/user_edit.html'),

kallithea/templates/admin/my_account/my_account_profile.html

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ ${h.form(url('my_account'), method='post @@
            </div>
          </div>
         <% readonly = None %>
         <% disabled = "" %>
         <div class="fields">
            %if c.extern_type != c.EXTERN_TYPE_INTERNAL:
+            %if c.user.extern_type != c.EXTERN_TYPE_INTERNAL:
                 <% readonly = "readonly" %>
                 <% disabled = " disabled" %>
                 <strong>${_('Your user is in an external Source of Record; some details cannot be managed here')}.</strong>
            %endif
              <div class="field">
                 <div class="label">

kallithea/templates/admin/users/user_edit_profile.html

➞

Show inline comments

@@ @@ -17,17 +17,17 @@ ${h.form(url('update_user', id=c.user.us @@
                 %endif
            </div>
         </div>
         <% readonly = None %>
         <% disabled = "" %>
         <div class="fields">
             %if c.extern_type != c.EXTERN_TYPE_INTERNAL:
+            %if c.user.extern_type != c.EXTERN_TYPE_INTERNAL:
              <div class="field">
                <% readonly = "readonly" %>
                <% disabled = " disabled" %>
                <strong>${_('This user is in an external Source of Record (%s); some details cannot be managed here.' % c.extern_type)}.</strong>
+               <strong>${_('This user is in an external Source of Record (%s); some details cannot be managed here.' % c.user.extern_type)}.</strong>
              </div>
             %endif
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>

0 comments (0 inline, 0 general)