Mercurial > public > src > rhodecode

diff pylons_app/model/forms.py @ 347:cec5cbc956c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Repository managment permissions, fixed found bugs updated js, added extra checks for doubled users and non active ones
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 01 Jul 2010 18:10:43 +0200
parents 05b212954275
children aafd9a98ea58
line wrap: on
line diff
--- a/pylons_app/model/forms.py	Thu Jul 01 00:57:45 2010 +0200
+++ b/pylons_app/model/forms.py	Thu Jul 01 18:10:43 2010 +0200
@@ -127,7 +127,9 @@
     def to_python(self, value, state):
         sa = meta.Session
         try:
-            self.user_db = sa.query(User).filter(User.username == value).one()
+            self.user_db = sa.query(User)\
+                .filter(User.active == True)\
+                .filter(User.username == value).one()
         except Exception:
             raise formencode.Invalid(_('This username is not valid'),
                                      value, state)
@@ -176,7 +178,9 @@
         sa = meta.Session
         for k, v in perms_new:
             try:
-                self.user_db = sa.query(User).filter(User.username == k).one()
+                self.user_db = sa.query(User)\
+                    .filter(User.active == True)\
+                    .filter(User.username == k).one()
             except Exception:
                 msg = self.message('perm_new_user_name',
                                      state=State_obj)