Changeset 7184 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

24 Nov 2011, 09:20:13 (13 years ago)

Author:

Henrik Bettermann

Message:

Reorganise permissions:

The navigation viewlets now manage the permission requirements themselves. No need to do this in pagetemplates.

Rename permission waeup.View to waeup.viewAcademics because it only refers to the academic section.

Add permission waeup.Authenticated (which is used in students). The StudentRecordOwner? explicitly needs this permission. Otherwise the MyData? tab disappears when changing the password.

Roles do not need to get the waeup.Public permission. This is already guaranteed in site.zcml.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• permissions.py (modified) (3 diffs)
• viewlets.py (modified) (5 diffs)

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

@@ -33 +33 @@
 from waeup.sirp.browser.resources import datepicker, datatable, tabs
 from waeup.sirp.browser.viewlets import (
-    ManageActionButton, PrimaryNavTab, AddActionButton)
+    ManageActionButton, AddActionButton)
 from waeup.sirp.interfaces import (
     IWAeUPObject, IUserAccount, IExtFileStore, IPasswordValidator)
@@ -80 +80 @@
     return
 
-class StudentsTab(PrimaryNavTab):
-    """Students tab in primary navigation.
-    """
-
-    grok.context(IWAeUPObject)
-    grok.order(4)
-    grok.require('waeup.viewStudent')
-    grok.template('primarynavtab')
-
-    pnav = 4
-    tab_title = u'Students'
-
-    @property
-    def link_target(self):
-        return self.view.application_url('students')
-
 class StudentsBreadcrumb(Breadcrumb):
     """A breadcrumb for the students container.
@@ -170 +154 @@
     grok.context(IStudentsContainer)
     grok.name('index')
-    grok.require('waeup.viewStudent')
+    grok.require('waeup.viewStudents')
     grok.template('containerpage')
     label = 'Student Section'

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

@@ -27 +27 @@
     grok.name('waeup.viewStudent')
 
+class ViewStudents(grok.Permission):
+    grok.name('waeup.viewStudents')
+
 class PayStudent(grok.Permission):
     grok.name('waeup.payStudent')
@@ -48 +51 @@
     grok.permissions('waeup.handleStudent', 'waeup.uploadStudentFile',
                      'waeup.viewStudent', 'waeup.payStudent',
-                     'waeup.handleAccommodation')
+                     'waeup.handleAccommodation', 'waeup.Authenticated')
 
 # Site Roles
 class StudentRole(grok.Role):
     grok.name('waeup.Student')
-    grok.permissions('waeup.Public', 'waeup.View')
+    grok.permissions('waeup.viewAcademics')
 
 class StudentsOfficer(grok.Role):
     grok.name('waeup.StudentsOfficer')
     grok.title(u'Students Officer (view only)')
-    grok.permissions('waeup.viewStudent',)
+    grok.permissions('waeup.viewStudent','waeup.viewStudents')
 
 class StudentsManager(grok.Role):
@@ -65 +68 @@
     grok.permissions('waeup.viewStudent', 'waeup.manageStudent',
                      'waeup.payStudent', 'waeup.uploadStudentFile',
-                     'waeup.handleAccommodation')
+                     'waeup.handleAccommodation', 'waeup.viewStudents')
 
 class StudentsClearanceOfficer(grok.Role):

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

@@ -7 +7 @@
 from waeup.sirp.utils.helpers import string_from_bytes, file_size
 from waeup.sirp.browser import DEFAULT_IMAGE_PATH
+from waeup.sirp.browser.viewlets import PrimaryNavTab
 from waeup.sirp.students.browser import (
     StudentClearanceDisplayFormPage, StudentClearanceManageFormPage,
@@ -139 +140 @@
     text = u'History'
 
+class StudentsTab(PrimaryNavTab):
+    """Students tab in primary navigation.
+    """
+
+    grok.context(IWAeUPObject)
+    grok.order(4)
+    grok.require('waeup.viewStudents')
+    grok.template('primarynavtab')
+
+    pnav = 4
+    tab_title = u'Students'
+
+    @property
+    def link_target(self):
+        return self.view.application_url('students')
+
 class PrimaryStudentNavManager(grok.ViewletManager):
     """Viewlet manager for the primary navigation tab.
@@ -151 +168 @@
     grok.template('primarynavtab')
     grok.order(1)
-    grok.require('waeup.View')
+    grok.require('waeup.Authenticated')
     pnav = 0 
     tab_title = u'Some Text'
@@ -166 +183 @@
         return ''
 
-class HomeTab(PrimaryStudentNavTab):
-    """Home-tab in primary navigation.
-    """
-    grok.order(1)
-    grok.require('waeup.Public')
-    pnav = 0
-    tab_title = u'Home'
-
-class ProspectusTab(PrimaryStudentNavTab):
-    """Faculties-tab in primary navigation.
-    """
-    grok.order(2)
-    grok.require('waeup.View')
-    pnav = 1
-    tab_title = u'Prospectus'
-
-    @property
-    def link_target(self):
-        return self.view.application_url('faculties')
+#class HomeTab(PrimaryStudentNavTab):
+#    """Home-tab in primary navigation.
+#    """
+#    grok.order(1)
+#    grok.require('waeup.Authenticated')
+#    pnav = 0
+#    tab_title = u'Home'
+
+#class ProspectusTab(PrimaryStudentNavTab):
+#    """Faculties-tab in primary navigation.
+#    """
+#    grok.order(2)
+#    grok.require('waeup.viewAcademics')
+#    pnav = 1
+#    tab_title = u'Prospectus'
+
+#    @property
+#    def link_target(self):
+#        return self.view.application_url('faculties')
 
 class MyDataTab(PrimaryStudentNavTab):
@@ -190 +207 @@
     """
     grok.order(3)
-    grok.require('waeup.Public')
+    grok.require('waeup.Authenticated')
     pnav = 4
     tab_title = u'My Data'