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

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/browser

Files:

• pages.py (modified) (6 diffs)
• templates/studentsitelayout.pt (modified) (1 diff)
• viewlets.py (modified) (6 diffs)

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

@@ -1128 +1128 @@
     """
     grok.context(IFacultyContainer)
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
     grok.name('index')
     title = 'Academics'
@@ -1206 +1206 @@
     """
     grok.context(IFaculty)
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
     grok.name('index')
     pnav = 1
@@ -1327 +1327 @@
     """
     grok.context(IDepartment)
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
     grok.name('index')
     pnav = 1
@@ -1547 +1547 @@
     grok.context(ICourse)
     grok.name('index')
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
     pnav = 1
     #form_fields = grok.AutoFields(ICourse)
@@ -1594 +1594 @@
     grok.context(ICertificate)
     grok.name('index')
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
     pnav = 1
     form_fields = grok.AutoFields(ICertificate)
@@ -1702 +1702 @@
     grok.context(ICertificateCourse)
     grok.name('index')
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
     pnav = 1
     #form_fields = grok.AutoFields(ICertificateCourse)

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt

@@ -29 +29 @@
             </span> </h1>
           <div id="navigation" class="yui-navset" style="text-align:right;">
-            <ul id="primary-navigation" tal:condition="layout/isAuthenticated">
+            <ul id="primary-navigation">
+              <tal:primary_nav content="structure provider:primary_nav" />
               <tal:primary_nav content="structure provider:primary_nav_student" />
-            </ul>
-            <ul id="primary-navigation" tal:condition="not: layout/isAuthenticated">
-              <tal:primary_nav content="structure provider:primary_nav" />
             </ul>
             <ul id="user-navigation">

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

@@ -551 +551 @@
     grok.viewletmanager(PrimaryNavManager)
     grok.order(1)
-    grok.require('waeup.View')
+    grok.require('waeup.Public')
 
     pnav = 0 # This is a kind of id of a tab. If some page provides
@@ -590 +590 @@
     """
     grok.order(2)
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
     grok.template('primarynavtab')
 
@@ -603 +603 @@
 class ContactTab(PrimaryNavTab):
     """Contact tab in primary navigation.
+
+    Display tab only for anonymous. Authenticated users can call the
+    form from the user navigation bar.
     """
     grok.order(6)
     grok.require('waeup.Anonymous')
     grok.template('primarynavtab')
-    
+    tab_title = u'Enquiries'
     pnav = 2
-    def tab_title(self):
-        """Display tab only for anonymous. Authenticated users can call the 
-        form from the user navigation bar.
-        """
-        userid = self.request.principal.id
-        if userid != 'zope.anybody':
-            tt = u'' 
-        else:
-            tt = u'Enquiries'         
-        return tt 
-
-    @property
-    def active(self):
-        view_pnav = getattr(self.view, 'pnav', 0)
-        userid = self.request.principal.id
-        if view_pnav == self.pnav and userid == 'zope.anybody':
-            return 'active'
-        return ''
+
+    # Also zope.manager has role Anonymous.
+    # To avoid displaying this tab, uncomment the following.
+    #def tab_title(self):
+    #    userid = self.request.principal.id
+    #    if userid != 'zope.anybody':
+    #        tt = u''
+    #    else:
+    #        tt = u'Enquiries'
+    #    return tt
+
+    #@property
+    #def active(self):
+    #    view_pnav = getattr(self.view, 'pnav', 0)
+    #    userid = self.request.principal.id
+    #    if view_pnav == self.pnav and userid == 'zope.anybody':
+    #        return 'active'
+    #    return ''
 
     @property
@@ -717 +720 @@
     grok.viewletmanager(SubobjectLister)
     grok.context(IFacultyContainer)
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
 
     def render(self):
@@ -728 +731 @@
     grok.viewletmanager(SubobjectLister)
     grok.context(IFaculty)
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
 
     def render(self):
@@ -740 +743 @@
     grok.viewletmanager(SubobjectLister)
     grok.context(IFaculty)
-    grok.require('waeup.View')
+    grok.require('waeup.viewAcademics')
 
     def render(self):