Changeset 6154

Timestamp:

20 May 2011, 04:35:59 (13 years ago)

Author:

Henrik Bettermann

Message:

add_local_role instead of AddLocalRole? because it's a function.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/permissions.py (modified) (1 diff)
• browser/pages.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/permissions.py

@@ -5 +5 @@
 ## $Id$
 ## 
-## Copyright (C) 2011 Uli Fouquet
+## Copyright (C) 2011 Uli Fouquet, Henrik Bettermann
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -14 +14 @@
 from hurry.workflow.interfaces import NoTransitionAvailableError
 from zope import schema
-try:
-    from zope.authentication.interfaces import (
-        IAuthentication, IUnauthenticatedPrincipal, ILogout)
-except ImportError:
-    # BBB
-    from zope.app.security.interfaces import (
-        IAuthentication, IUnauthenticatedPrincipal, ILogout)
+from zope.authentication.interfaces import (
+    IAuthentication, IUnauthenticatedPrincipal, ILogout)
 from zope.securitypolicy.interfaces import (
     IPrincipalRoleManager, IPrincipalRoleMap)
@@ -48 +43 @@
 grok.templatedir('templates')
 
-def addLocalRole(view, tab, **data):
+def add_local_role(view, tab, **data):
     form = view.request.form
     localrole = form['local_role']
@@ -1022 +1017 @@
     @grok.action('Add local role', validator=NullValidator)
     def addLocalRole(self, **data):
-        return addLocalRole(self, '3', **data)
+        return add_local_role(self, '3', **data)
 
 class DepartmentAddFormPage(WAeUPAddFormPage):
@@ -1209 +1204 @@
     @grok.action('Add local role', validator=NullValidator)
     def addLocalRole(self, **data):
-        return addLocalRole(self, 4, **data)
+        return add_local_role(self, 4, **data)
 
 class CourseAddFormPage(WAeUPAddFormPage):