Mercurial > kallithea

comparison rhodecode/controllers/admin/users.py @ 3565:a8f2d78d14ea beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
consistently capitalize initial letter in flash messages
author Mads Kiilerich <madski@unity3d.com>
date Wed, 20 Mar 2013 12:16:58 +0100
parents 9b92cf5a0cca
children 32cb8d45f330
comparison
equal deleted inserted replaced
3564:82b2d1a21ae3 3565:a8f2d78d14ea
125 form_result = user_form.to_python(dict(request.POST)) 125 form_result = user_form.to_python(dict(request.POST))
126 user_model.create(form_result) 126 user_model.create(form_result)
127 usr = form_result['username'] 127 usr = form_result['username']
128 action_logger(self.rhodecode_user, 'admin_created_user:%s' % usr, 128 action_logger(self.rhodecode_user, 'admin_created_user:%s' % usr,
129 None, self.ip_addr, self.sa) 129 None, self.ip_addr, self.sa)
130 h.flash(_('created user %s') % usr, 130 h.flash(_('Created user %s') % usr,
131 category='success') 131 category='success')
132 Session().commit() 132 Session().commit()
133 except formencode.Invalid, errors: 133 except formencode.Invalid, errors:
134 return htmlfill.render( 134 return htmlfill.render(
135 render('admin/users/user_add.html'), 135 render('admin/users/user_add.html'),
137 errors=errors.error_dict or {}, 137 errors=errors.error_dict or {},
138 prefix_error=False, 138 prefix_error=False,
139 encoding="UTF-8") 139 encoding="UTF-8")
140 except Exception: 140 except Exception:
141 log.error(traceback.format_exc()) 141 log.error(traceback.format_exc())
142 h.flash(_('error occurred during creation of user %s') \ 142 h.flash(_('Error occurred during creation of user %s') \
143 % request.POST.get('username'), category='error') 143 % request.POST.get('username'), category='error')
144 return redirect(url('users')) 144 return redirect(url('users'))
145 145
146 def new(self, format='html'): 146 def new(self, format='html'):
147 """GET /users/new: Form to create a new item""" 147 """GET /users/new: Form to create a new item"""
193 errors=e, 193 errors=e,
194 prefix_error=False, 194 prefix_error=False,
195 encoding="UTF-8") 195 encoding="UTF-8")
196 except Exception: 196 except Exception:
197 log.error(traceback.format_exc()) 197 log.error(traceback.format_exc())
198 h.flash(_('error occurred during update of user %s') \ 198 h.flash(_('Error occurred during update of user %s') \
199 % form_result.get('username'), category='error') 199 % form_result.get('username'), category='error')
200 return redirect(url('edit_user', id=id)) 200 return redirect(url('edit_user', id=id))
201 201
202 def delete(self, id): 202 def delete(self, id):
203 """DELETE /users/id: Delete an existing item""" 203 """DELETE /users/id: Delete an existing item"""
209 # url('user', id=ID) 209 # url('user', id=ID)
210 usr = User.get_or_404(id) 210 usr = User.get_or_404(id)
211 try: 211 try:
212 UserModel().delete(usr) 212 UserModel().delete(usr)
213 Session().commit() 213 Session().commit()
214 h.flash(_('successfully deleted user'), category='success') 214 h.flash(_('Successfully deleted user'), category='success')
215 except (UserOwnsReposException, DefaultUserException), e: 215 except (UserOwnsReposException, DefaultUserException), e:
216 h.flash(e, category='warning') 216 h.flash(e, category='warning')
217 except Exception: 217 except Exception:
218 log.error(traceback.format_exc()) 218 log.error(traceback.format_exc())
219 h.flash(_('An error occurred during deletion of user'), 219 h.flash(_('An error occurred during deletion of user'),