Changeset 7240 for main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py

Timestamp:

30 Nov 2011, 23:13:26 (13 years ago)

Author:

Henrik Bettermann

Message:

Rebuild applicants package (1st part). Applicants now have an applicant_id and a password and can use the regular login page to enter the portal.

Add user_type attribute to SIRPPrincipal objects.

Add some permissions in students package.

Some tests are still missing and will be re-added soon.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py (modified) (5 diffs)

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

@@ -32 +32 @@
 from waeup.sirp.browser.theming import get_all_themes, WAeUPThemeGray1
 from waeup.sirp.students.interfaces import IStudentNavigation
+from waeup.sirp.applicants.interfaces import IApplicant
 from waeup.sirp.authentication import get_principal_role_manager
 
@@ -163 +164 @@
         if usertitle == 'Unauthenticated User':
             return u'Anonymous User'
-        elif usertitle == 'Applicant':
-            return self.request.principal.id
         return usertitle
 
@@ -172 +171 @@
         userid = self.request.principal.id
         return userid
+
+    def isStudent(self):
+        usertype = getattr(self.request.principal, 'user_type', None)
+        if not usertype:
+            return False
+        return self.request.principal.user_type == 'student'
+
+    def isApplicant(self):
+        usertype = getattr(self.request.principal, 'user_type', None)
+        if not usertype:
+            return False
+        return self.request.principal.user_type == 'applicant'
 
     def getStudentName(self):
@@ -180 +191 @@
         return
 
-    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 getApplicantName(self):
+        """Return the applicant name.
+        """
+        if IApplicant.providedBy(self.context):
+            return self.context.fullname
+        return
 
     def update(self):
@@ -209 +221 @@
 
     def render(self):
-        if self.isStudent() or not self.isAuthenticated():
+        if self.isStudent() or self.isApplicant() or not self.isAuthenticated():
             return self.studenttemp.render(self)
         return self.stafftemp.render(self)