Changeset 7243 for main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py

Timestamp:

1 Dec 2011, 10:11:59 (13 years ago)

Author:

Henrik Bettermann

Message:

Use only one primarynavtab.pt pagetemplate and render list item only if link_target is provided.

Provide link_target of EnquiriesTab? and ApplicantsAnonTab? only if principal id is zope.anybody.

File:

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

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

@@ -30 +30 @@
 from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPXMLExporter,
                                    IWAeUPXMLImporter, IDataCenter, IUserAccount)
-from waeup.sirp.browser.layout import WAeUPPage
+from waeup.sirp.browser.layout import WAeUPPage, default_primary_nav_template
 from waeup.sirp.utils.helpers import get_user_account
 
@@ -571 +571 @@
     grok.order(1)
     grok.require('waeup.Public')
+    template = default_primary_nav_template
 
     pnav = 0 # This is a kind of id of a tab. If some page provides
@@ -600 +601 @@
     grok.order(1)
     grok.require('waeup.Public')
-    grok.template('primarynavtab')
 
     pnav = 0
@@ -610 +610 @@
     grok.order(2)
     grok.require('waeup.viewAcademics')
-    grok.template('primarynavtab')
 
     pnav = 1
@@ -628 +627 @@
     grok.order(6)
     grok.require('waeup.Anonymous')
-    grok.template('primarynavtab')
     tab_title = u'Enquiries'
     pnav = 2
 
+    # Also zope.manager has role Anonymous.
+    # To avoid displaying this tab, we have to check the principal id too.
     @property
     def link_target(self):
-        return self.view.application_url('enquiries')
+        if self.request.principal.id == 'zope.anybody':
+            return self.view.application_url('enquiries')
+        return
 
 #