Mercurial > kallithea

changeset 1501:a828b83dfa4b beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecated UserModel removals - removed from permissions controller - removed from settings controller
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 30 Sep 2011 18:07:03 +0300
parents 256e729a94cd
children a2efbfe84067
files rhodecode/controllers/admin/permissions.py rhodecode/controllers/admin/settings.py
diffstat 2 files changed, 11 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/admin/permissions.py	Fri Sep 30 18:03:20 2011 +0300
+++ b/rhodecode/controllers/admin/permissions.py	Fri Sep 30 18:07:03 2011 +0300
@@ -23,19 +23,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import logging
+import traceback
+import formencode
 from formencode import htmlfill
+
 from pylons import request, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
+
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
-from rhodecode.model.forms import LdapSettingsForm, DefaultPermissionsForm
+from rhodecode.model.forms import DefaultPermissionsForm
 from rhodecode.model.permission import PermissionModel
-from rhodecode.model.user import UserModel
-import formencode
-import logging
-import traceback
+from rhodecode.model.db import User
 
 log = logging.getLogger(__name__)
 
@@ -142,7 +144,7 @@
         c.create_choices = self.create_choices
 
         if id == 'default':
-            default_user = UserModel().get_by_username('default')
+            default_user = User.by_username('default')
             defaults = {'_method': 'put',
                         'anonymous': default_user.active}
 
--- a/rhodecode/controllers/admin/settings.py	Fri Sep 30 18:03:20 2011 +0300
+++ b/rhodecode/controllers/admin/settings.py	Fri Sep 30 18:07:03 2011 +0300
@@ -46,6 +46,7 @@
     ApplicationUiSettingsForm
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.user import UserModel
+from rhodecode.model.db import User
 
 log = logging.getLogger(__name__)
 
@@ -299,7 +300,7 @@
         """
         # url('admin_settings_my_account')
 
-        c.user = UserModel().get(self.rhodecode_user.user_id, cache=False)
+        c.user = User.get(self.rhodecode_user.user_id)
         all_repos = self.sa.query(Repository)\
                      .filter(Repository.user_id == c.user.user_id)\
                      .order_by(func.lower(Repository.repo_name)).all()
@@ -340,8 +341,7 @@
                     category='success')
 
         except formencode.Invalid, errors:
-            c.user = user_model.get(self.rhodecode_user.user_id, cache=False)
-            c.user = UserModel().get(self.rhodecode_user.user_id, cache=False)
+            c.user = User.get(self.rhodecode_user.user_id)
             all_repos = self.sa.query(Repository)\
                 .filter(Repository.user_id == c.user.user_id)\
                 .order_by(func.lower(Repository.repo_name))\