Changeset 6686 for main/waeup.sirp/trunk/src/waeup

Timestamp:

6 Sep 2011, 08:15:39 (13 years ago)

Author:

Henrik Bettermann

Message:

Redirect students to their data page after login.

Fix test.

Location:

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

Files:

• pages.py (modified) (4 diffs)
• tests/test_permissions.py (modified) (1 diff)

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

@@ -40 +40 @@
 from waeup.sirp.users import LocalRoleSetEvent
 from waeup.sirp.widgets.restwidget import ReSTDisplayWidget
+from waeup.sirp.authentication import get_principal_role_manager
 
 
@@ -102 +103 @@
     camefrom = None
 
+    def isStudent(self):
+        prm = get_principal_role_manager()
+        roles = [x[0] for x in prm.getRolesForPrincipal(self.request.principal.id)]
+        return 'waeup.Student' in roles
+
     def update(self, SUBMIT=None, camefrom=None):
         self.camefrom = camefrom
@@ -107 +113 @@
             if self.request.principal.id != 'zope.anybody':
                 self.flash('You logged in.')
+                if self.isStudent():
+                    rel_link = '/students/%s' % self.request.principal.id
+                    self.redirect(self.application_url() + rel_link)
+                    return
                 if not self.camefrom:
                     # User might have entered the URL directly. Let's beam
@@ -116 +126 @@
             self.flash('You entered wrong credentials.')
 
-class LoginStaffPage(LoginPage):
-    """A login page for staff members.
-    """
-    grok.name('loginstaff')
-    grok.template('loginstaffpage')
-    grok.require('waeup.Public')
-    title = u'Staff Login'
-
-class LoginStudentPage(LoginPage):
-    """A login page for students.
-    """
-    grok.name('loginstudent')
-    grok.template('loginstudentpage')
-    grok.require('waeup.Public')
-    title = u'Student Login'
 
 class LogoutPage(WAeUPPage):

main/waeup.sirp/trunk/src/waeup/sirp/browser/tests/test_permissions.py

@@ -64 +64 @@
 public_pages = [
     # Pages accessible also by the public...
-    '/@@index', '/@@login','/@@loginstaff', '/@@loginstudent', '/@@logout',
+    '/@@index', '/@@login', '/@@logout',
     ]