Mercurial > kallithea

changeset 5431:7b780f5f5cab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
auth: avoid random auth_internal failures - add explicit import of auth_internal to user admin auth_internal would often have been loaded by the custom auth module loader and available as auth_modules.auth_internal ... but sometimes it wasn't and navigating to Add User would fail with: File '.../kallithea/controllers/admin/users.py', line 155 in new c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name AttributeError: 'module' object has no attribute 'auth_internal'
author Søren Løvborg <sorenl@unity3d.com>
date Mon, 24 Aug 2015 16:50:43 +0200
parents b36da33275a0
children a4c0fe15a6f1
files kallithea/controllers/admin/users.py
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/admin/users.py	Mon Aug 24 12:25:56 2015 +0200
+++ b/kallithea/controllers/admin/users.py	Mon Aug 24 16:50:43 2015 +0200
@@ -43,6 +43,7 @@
 from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     AuthUser
 from kallithea.lib import auth_modules
+from kallithea.lib.auth_modules import auth_internal
 from kallithea.lib.base import BaseController, render
 from kallithea.model.api_key import ApiKeyModel
 
@@ -120,8 +121,8 @@
     def create(self):
         """POST /users: Create a new item"""
         # url('users')
-        c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name
-        c.default_extern_name = auth_modules.auth_internal.KallitheaAuthPlugin.name
+        c.default_extern_type = auth_internal.KallitheaAuthPlugin.name
+        c.default_extern_name = auth_internal.KallitheaAuthPlugin.name
         user_model = UserModel()
         user_form = UserForm()()
         try:
@@ -152,8 +153,8 @@
     def new(self, format='html'):
         """GET /users/new: Form to create a new item"""
         # url('new_user')
-        c.default_extern_type = auth_modules.auth_internal.KallitheaAuthPlugin.name
-        c.default_extern_name = auth_modules.auth_internal.KallitheaAuthPlugin.name
+        c.default_extern_type = auth_internal.KallitheaAuthPlugin.name
+        c.default_extern_name = auth_internal.KallitheaAuthPlugin.name
         return render('admin/users/user_add.html')
 
     def update(self, id):