Mercurial > kallithea

comparison rhodecode/controllers/admin/users.py @ 2662:91c442a489bb beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sqlalchemy sessions cleanup in admin Cleanup settings options
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 26 Jul 2012 15:36:44 +0200
parents 80d837028c40
children cc8d7d450d15
comparison
equal deleted inserted replaced
2661:09e54a646eb6 2662:91c442a489bb
124 usr = form_result['username'] 124 usr = form_result['username']
125 action_logger(self.rhodecode_user, 'admin_created_user:%s' % usr, 125 action_logger(self.rhodecode_user, 'admin_created_user:%s' % usr,
126 None, self.ip_addr, self.sa) 126 None, self.ip_addr, self.sa)
127 h.flash(_('created user %s') % usr, 127 h.flash(_('created user %s') % usr,
128 category='success') 128 category='success')
129 Session.commit() 129 Session().commit()
130 except formencode.Invalid, errors: 130 except formencode.Invalid, errors:
131 return htmlfill.render( 131 return htmlfill.render(
132 render('admin/users/user_add.html'), 132 render('admin/users/user_add.html'),
133 defaults=errors.value, 133 defaults=errors.value,
134 errors=errors.error_dict or {}, 134 errors=errors.error_dict or {},
164 user_model.update(id, form_result) 164 user_model.update(id, form_result)
165 usr = form_result['username'] 165 usr = form_result['username']
166 action_logger(self.rhodecode_user, 'admin_updated_user:%s' % usr, 166 action_logger(self.rhodecode_user, 'admin_updated_user:%s' % usr,
167 None, self.ip_addr, self.sa) 167 None, self.ip_addr, self.sa)
168 h.flash(_('User updated successfully'), category='success') 168 h.flash(_('User updated successfully'), category='success')
169 Session.commit() 169 Session().commit()
170 except formencode.Invalid, errors: 170 except formencode.Invalid, errors:
171 c.user_email_map = UserEmailMap.query()\ 171 c.user_email_map = UserEmailMap.query()\
172 .filter(UserEmailMap.user == c.user).all() 172 .filter(UserEmailMap.user == c.user).all()
173 defaults = errors.value 173 defaults = errors.value
174 e = errors.error_dict or {} 174 e = errors.error_dict or {}
196 # method='delete') 196 # method='delete')
197 # url('user', id=ID) 197 # url('user', id=ID)
198 user_model = UserModel() 198 user_model = UserModel()
199 try: 199 try:
200 user_model.delete(id) 200 user_model.delete(id)
201 Session.commit() 201 Session().commit()
202 h.flash(_('successfully deleted user'), category='success') 202 h.flash(_('successfully deleted user'), category='success')
203 except (UserOwnsReposException, DefaultUserException), e: 203 except (UserOwnsReposException, DefaultUserException), e:
204 h.flash(e, category='warning') 204 h.flash(e, category='warning')
205 except Exception: 205 except Exception:
206 log.error(traceback.format_exc()) 206 log.error(traceback.format_exc())
250 250
251 perm = Permission.get_by_key('hg.create.repository') 251 perm = Permission.get_by_key('hg.create.repository')
252 user_model.grant_perm(id, perm) 252 user_model.grant_perm(id, perm)
253 h.flash(_("Granted 'repository create' permission to user"), 253 h.flash(_("Granted 'repository create' permission to user"),
254 category='success') 254 category='success')
255 Session.commit() 255 Session().commit()
256 else: 256 else:
257 perm = Permission.get_by_key('hg.create.repository') 257 perm = Permission.get_by_key('hg.create.repository')
258 user_model.revoke_perm(id, perm) 258 user_model.revoke_perm(id, perm)
259 259
260 perm = Permission.get_by_key('hg.create.none') 260 perm = Permission.get_by_key('hg.create.none')
261 user_model.grant_perm(id, perm) 261 user_model.grant_perm(id, perm)
262 h.flash(_("Revoked 'repository create' permission to user"), 262 h.flash(_("Revoked 'repository create' permission to user"),
263 category='success') 263 category='success')
264 Session.commit() 264 Session().commit()
265 return redirect(url('edit_user', id=id)) 265 return redirect(url('edit_user', id=id))
266 266
267 def add_email(self, id): 267 def add_email(self, id):
268 """POST /user_emails:Add an existing item""" 268 """POST /user_emails:Add an existing item"""
269 # url('user_emails', id=ID, method='put') 269 # url('user_emails', id=ID, method='put')
272 email = request.POST.get('new_email') 272 email = request.POST.get('new_email')
273 user_model = UserModel() 273 user_model = UserModel()
274 274
275 try: 275 try:
276 user_model.add_extra_email(id, email) 276 user_model.add_extra_email(id, email)
277 Session.commit() 277 Session().commit()
278 h.flash(_("Added email %s to user") % email, category='success') 278 h.flash(_("Added email %s to user") % email, category='success')
279 except formencode.Invalid, error: 279 except formencode.Invalid, error:
280 msg = error.error_dict['email'] 280 msg = error.error_dict['email']
281 h.flash(msg, category='error') 281 h.flash(msg, category='error')
282 except Exception: 282 except Exception:
288 def delete_email(self, id): 288 def delete_email(self, id):
289 """DELETE /user_emails_delete/id: Delete an existing item""" 289 """DELETE /user_emails_delete/id: Delete an existing item"""
290 # url('user_emails_delete', id=ID, method='delete') 290 # url('user_emails_delete', id=ID, method='delete')
291 user_model = UserModel() 291 user_model = UserModel()
292 user_model.delete_extra_email(id, request.POST.get('del_email')) 292 user_model.delete_extra_email(id, request.POST.get('del_email'))
293 Session.commit() 293 Session().commit()
294 h.flash(_("Removed email from user"), category='success') 294 h.flash(_("Removed email from user"), category='success')
295 return redirect(url('edit_user', id=id)) 295 return redirect(url('edit_user', id=id))