[Mpuls-commits] r1445 - wasko/branches/2.0/waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-10 11:13:32 +0100 (Wed, 10 Feb 2010)
New Revision: 1445

Modified:
   wasko/branches/2.0/waskaweb/controllers/administration.py
Log:
* waskaweb/controllers/administration.py: Removed unused imports and
static vars. Formatting.


Modified: wasko/branches/2.0/waskaweb/controllers/administration.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-10 10:07:00 UTC (rev 1444)
+++ wasko/branches/2.0/waskaweb/controllers/administration.py	2010-02-10 10:13:32 UTC (rev 1445)
@@ -35,22 +35,14 @@
 from formencode import htmlfill
 from pylons.i18n import _
 
-from mpulsweb.lib.security import getDbName
-from mpulsweb.model.user import UserObject, UserListObject, UserGroup, \
-     UserGroupList, UserGroupFactory
-
-from waskaweb.lib.base import c, redirect_to, render, request, session
-
-from waskaweb.lib.validators import ValidatorStateObject, NewUserForm, \
-     EditUserForm, NewPasswordForm, DeleteUserHelperForm, \
-     NewUserGroupForm, EditUserGroupForm
 from mpulsweb.lib.security import checkRole
+from mpulsweb.model.user import UserObject, UserListObject
+from mpulsweb.controllers.administration import AdministrationController as BaseAdministrationController
 
+from waskaweb.lib.base import c, redirect_to, render, request, session
+from waskaweb.lib.validators import DeleteUserHelperForm
 from waskaweb.model.case import CaseOverview, CaseBundle
 
-from mpulsweb.controllers.administration import AdministrationController as BaseAdministrationController
-
-
 log = logging.getLogger(__name__)
 
 
@@ -59,10 +51,6 @@
 
 DELETE_SELFUSER_FAILURE = _('adm_delete_selfuser_notification_header')
 DELETE_SELFUSER_FAILURE_TEXT = _('adm_delete_selfuser_notification_text')
-DELETE_USER_NOTIFICATION = _('adm_delete_user_notification_header')
-DELETE_USER_NOTIFICATION_TEXT = _('adm_delete_user_notification_text')
-NEW_USER_FAILURE_HEADER = _('adm_delete_user_failure_header')
-NEW_USER_FAILURE_TEXT = _('adm_delete_user_failure_text')
 DELETE_USER_SUCCESS_HEADER = _('adm_delete_user_success_header')
 DELETE_USER_SUCCESS_TEXT = _('adm_delete_user_success_text')