Changeset 8367 for main/waeup.kofa/trunk/src/waeup/kofa/browser

Timestamp:

6 May 2012, 11:19:38 (13 years ago)

Author:

Henrik Bettermann

Message:

Add more roles and reorganize permissions.

Remove grok.require('waeup.manageUniversity') from grok.Container classes.

Location:

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

Files:

• pages.py (modified) (24 diffs)
• viewlets.py (modified) (14 diffs)

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

@@ -311 +311 @@
     grok.name('administration')
     grok.context(IUniversity)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.managePortal')
     label = _(u'Administration')
     pnav = 0
@@ -356 +356 @@
     grok.context(IUniversity)
     grok.name('reindex')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.managePortal')
 
     def update(self,ctlg=None):
@@ -594 +594 @@
     grok.name('search')
     grok.template('searchpage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.viewAcademics')
     label = _(u"Search Academic Section")
     pnav = 1
@@ -863 +863 @@
     grok.name('import1')
     grok.template('datacenterimport1page')
-    grok.require('waeup.manageDataCenter')
+    grok.require('waeup.importData')
     label = _(u'Process CSV file')
     pnav = 0
@@ -893 +893 @@
     grok.name('import2')
     grok.template('datacenterimport2page')
-    grok.require('waeup.manageDataCenter')
+    grok.require('waeup.importData')
     label = _(u'Process CSV file')
     pnav = 0
@@ -1013 +1013 @@
     grok.name('import3')
     grok.template('datacenterimport3page')
-    grok.require('waeup.manageDataCenter')
+    grok.require('waeup.importData')
     label = _(u'Process CSV file')
     pnav = 0
@@ -1121 +1121 @@
     grok.name('import4')
     grok.template('datacenterimport4page')
-    grok.require('waeup.manageDataCenter')
+    grok.require('waeup.importData')
     label = _(u'Process CSV file')
     pnav = 0
@@ -1178 +1178 @@
     grok.name('logs')
     grok.template('datacenterlogspage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageDataCenter')
     label = _(u'Show logfiles')
     pnav = 0
@@ -1200 +1200 @@
     grok.name('show')
     grok.template('datacenterlogsshowfilepage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageDataCenter')
     title = _(u'Data Center')
     pnav = 0
@@ -1275 +1275 @@
     grok.name('export')
     grok.template('datacenterexportpage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageDataCenter')
     label = _('Download portal data as CSV file')
     pnav = 0
@@ -1302 +1302 @@
     grok.context(IDataCenter)
     grok.name('export.csv')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageDataCenter')
 
     def render(self, exporter=None):
@@ -1318 +1318 @@
     """
     grok.name('export.xml')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.managePortal')
 
     def render(self):
@@ -1335 +1335 @@
     """
     grok.name('importxml')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.managePortal')
 
     def update(self, xmlfile=None, CANCEL=None, SUBMIT=None):
@@ -1378 +1378 @@
     grok.context(IFacultiesContainer)
     grok.name('manage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     grok.template('facultiescontainermanagepage')
     pnav = 1
@@ -1412 +1412 @@
     """
     grok.context(IFacultiesContainer)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     grok.name('add')
     label = _('Add faculty')
@@ -1453 +1453 @@
     grok.context(IFaculty)
     grok.name('manage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     grok.template('facultymanagepage')
     pnav = 1
@@ -1527 +1527 @@
     grok.context(IFaculty)
     grok.name('add')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     label = _('Add department')
     form_fields = grok.AutoFields(IDepartmentAdd)
@@ -1621 +1621 @@
     grok.context(IDepartment)
     grok.name('manage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     pnav = 1
     grok.template('departmentmanagepage')
@@ -1723 +1723 @@
     grok.context(IDepartment)
     grok.name('addcourse')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     label = _(u'Add course')
     form_fields = grok.AutoFields(ICourseAdd)
@@ -1760 +1760 @@
     grok.context(IDepartment)
     grok.name('addcertificate')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     label = _(u'Add certificate')
     form_fields = grok.AutoFields(ICertificateAdd)
@@ -1814 +1814 @@
     grok.context(ICourse)
     grok.name('manage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     label = _(u'Edit course')
     pnav = 1
@@ -1863 +1863 @@
     grok.context(ICertificate)
     grok.name('manage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     pnav = 1
     label = _('Edit certificate')
@@ -1941 +1941 @@
     grok.context(ICertificate)
     grok.name('addcertificatecourse')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     form_fields = grok.AutoFields(ICertificateCourseAdd)
     pnav = 1
@@ -1990 +1990 @@
     grok.context(ICertificateCourse)
     grok.name('manage')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     form_fields = grok.AutoFields(ICertificateCourse)
     label = _('Edit course referrer')

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

@@ -155 +155 @@
     grok.baseclass()
     grok.order(2)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     icon = 'actionicon_modify.png'
     target = '@@manage'
@@ -165 +165 @@
     grok.baseclass()
     grok.order(4)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     icon = 'actionicon_add.png'
     target = 'add'
@@ -175 +175 @@
     grok.baseclass()
     grok.order(4)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     icon = 'actionicon_delete.png'
     target = 'remove'
@@ -185 +185 @@
     grok.baseclass()
     grok.order(5)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     icon = 'actionicon_search.png'
     target = 'search'
@@ -236 +236 @@
 #     #grok.view(Index)
 #     grok.order(98)
-#     grok.require('waeup.manageUniversity')
+#     grok.require('waeup.managePortal')
 
 #class ImportXMLAction(grok.Viewlet):
@@ -242 +242 @@
 #    #grok.view(Index)
 #    grok.order(99)
-#    grok.require('waeup.manageUniversity')
+#    grok.require('waeup.managePortal')
 #
 #    def update(self):
@@ -259 +259 @@
     grok.context(IKofaObject)
     grok.order(5)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     icon = 'actionicon_modify.png' # File must exist in static/
     title = 'Text of link'
@@ -346 +346 @@
     every page the user is allowed to go to, if the user has also the
     permissions set by `grok.require()`. By default only users with
-    ``waeup.manageUniversity`` permission will see links defined by
+    ``waeup.manageAcademics`` permission will see links defined by
     this or derivated classes.
     """
@@ -523 +523 @@
     grok.template('actionbutton')
     grok.viewletmanager(ActionBar)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
     icon = 'actionicon_manage.png' # File must exist in static/
     target = '@@show' # link to this viewname.
@@ -542 +542 @@
     grok.context(IDataCenter)
     grok.view(DatacenterPage)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.importData')
     grok.order(6)
     icon = 'actionicon_gear.png'
@@ -551 +551 @@
     grok.context(IDataCenter)
     grok.view(DatacenterPage)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageDataCenter')
     grok.order(5)
     icon = 'actionicon_up.png'
@@ -560 +560 @@
     grok.context(IDataCenter)
     grok.view(DatacenterPage)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageDataCenter')
     grok.order(7)
     icon = 'actionicon_down.png'
@@ -657 +657 @@
     grok.order(1)
     grok.viewletmanager(AdministrationTasks)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.managePortal')
     grok.template('admintask')
 
@@ -765 +765 @@
     grok.viewletmanager(SubobjectLister)
     grok.context(IFaculty)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageAcademics')
 
     def render(self):