Changeset - b36da33275a0
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Søren Løvborg - 10 years ago 2015-08-24 12:25:56
sorenl@unity3d.com
users: fix missing c.readonly in UsersController.update error rendering

The c.readonly attribute, while correctly set in UsersControllers.edit,
was not assigned in UsersControllers.update, causing a template error
if the form validation failed. This commit unifies template rendering
in separate method to fix this and avoid future problems.
1 file changed with 16 insertions and 15 deletions:
kallithea/controllers/admin/users.py
16
15
0 comments (0 inline, 0 general)
kallithea/controllers/admin/users.py
➞
Show inline comments
 
@@ -161,24 +161,21 @@ class UsersController(BaseController):
 
        # Forms posted to this method should contain a hidden field:
 
        #    <input type="hidden" name="_method" value="PUT" />
 
        # Or using helpers:
 
        #    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.perm_user = AuthUser(user_id=id)
 
        c.ip_addr = self.ip_addr
 
        user = user_model.get(id)
 
        _form = UserForm(edit=True, old_data={'user_id': id,
 
                                              'email': c.user.email})()
 
                                              'email': user.email})()
 
        form_result = {}
 
        try:
 
            form_result = _form.to_python(dict(request.POST))
 
            skip_attrs = ['extern_type', 'extern_name',
 
                         ] + auth_modules.get_managed_fields(c.user)
 
                         ] + auth_modules.get_managed_fields(user)
 

			




	
	
	
		
 
            user_model.update(id, form_result, skip_attrs=skip_attrs)

			




	
	
	
		
 
            usr = form_result['username']

			




	
	
	
		
 
            action_logger(self.authuser, 'admin_updated_user:%s' % usr,

			




	
	
	
		
 
                          None, self.ip_addr, self.sa)

			




	
	
	
		
 
            h.flash(_('User updated successfully'), category='success')

			




	
	
		
 
@@ -190,13 +187,13 @@ class UsersController(BaseController):

			




	
	
	
		
 
                'create_repo_perm': user_model.has_perm(id,

			




	
	
	
		
 
                                                        'hg.create.repository'),

			




	
	
	
		
 
                'fork_repo_perm': user_model.has_perm(id, 'hg.fork.repository'),

			




	
	
	
		
 
                '_method': 'put'

			




	
	
	
		
 
            })

			




	
	
	
		
 
            return htmlfill.render(

			




	
	
	
		
 
                render('admin/users/user_edit.html'),

			




	
	
	
		
 
                self._render_edit_profile(user),

			




	
	
	
		
 
                defaults=defaults,

			




	
	
	
		
 
                errors=e,

			




	
	
	
		
 
                prefix_error=False,

			




	
	
	
		
 
                encoding="UTF-8",

			




	
	
	
		
 
                force_defaults=False)

			




	
	
	
		
 
        except Exception:

			




	
	
		
 
@@ -235,25 +232,29 @@ class UsersController(BaseController):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            return User.get_or_404(id, allow_default=False)

			




	
	
	
		
 
        except DefaultUserException:

			




	
	
	
		
 
            h.flash(_("The default user cannot be edited"), category='warning')

			




	
	
	
		
 
            raise HTTPNotFound

			




	
	
	
		
 

			




	
	
	
		
 
    def _render_edit_profile(self, user):

			




	
	
	
		
 
        c.user = user

			




	
	
	
		
 
        c.active = 'profile'

			




	
	
	
		
 
        c.perm_user = AuthUser(dbuser=user)

			




	
	
	
		
 
        c.ip_addr = self.ip_addr

			




	
	
	
		
 
        managed_fields = auth_modules.get_managed_fields(user)

			




	
	
	
		
 
        c.readonly = lambda n: 'readonly' if n in managed_fields else None

			




	
	
	
		
 
        return render('admin/users/user_edit.html')

			




	
	
	
		
 

			




	
	
	
		
 
    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.perm_user = AuthUser(user_id=id)

			




	
	
	
		
 
        c.ip_addr = self.ip_addr

			




	
	
	
		
 
        managed_fields = auth_modules.get_managed_fields(c.user)

			




	
	
	
		
 
        c.readonly = lambda n: 'readonly' if n in managed_fields else None

			




	
	
	
		
 
        user = self._get_user_or_raise_if_default(id)

			




	
	
	
		
 
        defaults = user.get_dict()

			




	
	
	
		
 

			




	
	
	
		
 
        defaults = c.user.get_dict()

			




	
	
	
		
 
        return htmlfill.render(

			




	
	
	
		
 
            render('admin/users/user_edit.html'),

			




	
	
	
		
 
            self._render_edit_profile(user),

			




	
	
	
		
 
            defaults=defaults,

			




	
	
	
		
 
            encoding="UTF-8",

			




	
	
	
		
 
            force_defaults=False)

			




	
	
	
		
 

			




	
	
	
		
 
    def edit_advanced(self, id):

			




	
	
	
		
 
        c.user = self._get_user_or_raise_if_default(id)

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.