Changeset 10080

Timestamp:

14 Apr 2013, 15:33:09 (11 years ago)

Author:

Henrik Bettermann

Message:

Change permissions for PaymentsManageFormPage?. The view permission is sufficient to view the manage page but no payment can be removed.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/static/waeup-base.css (modified) (2 diffs)
• students/browser.py (modified) (3 diffs)
• students/browser_templates/paymentsmanagepage.pt (modified) (1 diff)
• students/viewlets.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/static/waeup-base.css

@@ -43 +43 @@
 
 .container {
-  width: 700px;
+  width: 800px;
 }
 
@@ -191 +191 @@
   padding-left: 20px;
   padding-right: 20px;
-  width: 700px;
+  width: 800px;
   background-color: #FFFFFF;
   background-image: None;

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

@@ -28 +28 @@
 from zope.schema.interfaces import ConstraintNotSatisfied, RequiredMissing
 from zope.formlib.textwidgets import BytesDisplayWidget
+from zope.security import checkPermission
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from waeup.kofa.accesscodes import (
@@ -1442 +1443 @@
     grok.context(IStudentPaymentsContainer)
     grok.name('index')
-    grok.require('waeup.payStudent')
+    grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IStudentPaymentsContainer)
     grok.template('paymentsmanagepage')
     pnav = 4
+
+    @property
+    def manage_payments_allowed(self):
+        return checkPermission('waeup.payStudent', self.context)
 
     def unremovable(self, ticket):
@@ -1451 +1456 @@
         if not usertype:
             return False
+        if not self.manage_payments_allowed:
+            return True
         return (self.request.principal.user_type == 'student' and ticket.r_code)
 

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/paymentsmanagepage.pt

@@ -37 +37 @@
   </table>
 
-  <div tal:condition="view/availableActions">
+  <div tal:condition="python: view.availableActions and view.manage_payments_allowed">
     <span tal:repeat="action view/actions"
           tal:omit-tag="">

main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py

@@ -121 +121 @@
 class StudentManagePaymentsLink(StudentManageLink):
     grok.order(6)
-    grok.require('waeup.payStudent')
+    grok.require('waeup.viewStudent')
     link = 'payments'
     text = _(u'Payments')