Changeset 7251

Timestamp:

2 Dec 2011, 12:47:35 (13 years ago)

Author:

Henrik Bettermann

Message:

Minor adjustments in students.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -114 +114 @@
 
 class OnlinePaymentBreadcrumb(Breadcrumb):
-    """A breadcrumb for course lists.
+    """A breadcrumb for payments.
     """
     grok.context(IStudentOnlinePayment)
@@ -987 +987 @@
 
     def unremovable(self, ticket):
-        prm = get_principal_role_manager()
-        roles = [x[0] for x in prm.getRolesForPrincipal(self.request.principal.id)]
-        return ('waeup.Student' in roles and ticket.r_code)
+        usertype = getattr(self.request.principal, 'user_type', None)
+        if not usertype:
+            return False
+        return (self.request.principal.user_type == 'student' and ticket.r_code)
 
     def formatDatetime(self,datetimeobj):
@@ -1085 +1086 @@
                ticket.p_session == p_session:
                   self.flash(
-                      'This type of payment ticket exists and ticket has been paid.')
+                      'This type of payment has already been made.')
                   self.redirect(self.url(self.context))
                   return

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -1015 +1015 @@
         self.browser.getControl("Create ticket").click()
         self.assertMatches(
-            '...This type of payment ticket exists and ticket has been paid...',
+            '...This type of payment has already been made...',
             self.browser.contents)