Changeset 6198 for main

Timestamp:

26 May 2011, 06:58:55 (14 years ago)

Author:

Henrik Bettermann

Message:

Convert waeup.local.ApplicationsOfficer? to waeup.ApplicationsOfficer?.
Change and simplify permission settings in application section.
Assign application section permissions to Portal Manager.

Actually we need a Campus Manager (Academics Section Manager) too. Then manageUniversity should be renamed to manageAcademics.

Location:

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

Files:

• applicants/applicants.py (modified) (1 diff)
• applicants/browser.py (modified) (12 diffs)
• applicants/container.py (modified) (1 diff)
• applicants/permissions.py (modified) (1 diff)
• applicants/root.py (modified) (1 diff)
• permissions.py (modified) (1 diff)
• permissions.txt (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicants.py

@@ -59 +59 @@
     access_code = index.Field(attribute='access_code')
 
-
 class ApplicantTraverser(grok.Traverser):
     """Get image of the context applicant.

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

@@ -89 +89 @@
     grok.context(IApplicantsRoot)
     grok.view(ApplicantsRootPage)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageApplications')
     text = 'Manage application section'
 
@@ -99 +99 @@
     label = 'Manage application section'
     pnav = 3
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageApplications')
     taboneactions = ['Add applicants container', 'Remove selected','Cancel']
     tabtwoactions1 = ['Remove selected local roles']
@@ -164 +164 @@
 class ApplicantsContainerAddFormPage(WAeUPAddFormPage):
     grok.context(IApplicantsRoot)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageApplications')
     grok.name('add')
     grok.template('applicantscontaineraddpage')
@@ -236 +236 @@
     grok.context(IWAeUPObject)
     grok.order(3)
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageApplications')
     grok.template('primarynavtab')
 
@@ -271 +271 @@
     grok.context(IApplicantsContainer)
     grok.view(ApplicantsContainerPage)
+    grok.require('waeup.manageApplications')
     text = 'Manage applicants container'
 
@@ -286 +287 @@
     form_fields['startdate'].custom_widget = FriendlyDateWidget('le')
     form_fields['enddate'].custom_widget = FriendlyDateWidget('le')
-    grok.require('waeup.manageUniversity')
+    grok.require('waeup.manageApplications')
 
     @property
@@ -426 +427 @@
             applicant_object = get_applicant_data(access_code)
             url = absoluteURL(applicant_object, self.request)
-            return u'<div class="portlet"><a href="%s">%s</a></div>' % (
+            return u'<div class="portlet"><a href="%s/edit">%s</a></div>' % (
                 url,access_code)
         return ''
@@ -433 +434 @@
     grok.context(IApplicant)
     grok.name('index')
-    grok.require('waeup.viewApplication')
+    grok.require('waeup.handleApplication')
     form_fields = grok.AutoFields(IApplicant).omit('locked')
     #form_fields['fst_sit_results'].custom_widget = list_results_display_widget
@@ -450 +451 @@
         return '%s Application Record' % container_title
 
+class ApplicantsManageActionButton(ManageActionButton):
+    grok.context(IApplicant)
+    grok.view(DisplayApplicant)
+    grok.require('waeup.manageApplications')
+    text = 'Edit application record'
+    target = 'edit_full'
+
 class EditApplicantFull(WAeUPEditFormPage):
     """A full edit view for applicant data.
@@ -455 +463 @@
     grok.context(IApplicant)
     grok.name('edit_full')
-    grok.require('waeup.editFullApplication')
+    grok.require('waeup.manageApplications')
     form_fields = grok.AutoFields(IApplicant)   #.omit('locked')
     form_fields['passport'].custom_widget = EncodingImageFileWidget
@@ -488 +496 @@
     grok.context(IApplicantEdit)
     grok.name('edit')
-    grok.require('waeup.editApplication')
+    grok.require('waeup.handleApplication')
     form_fields = grok.AutoFields(IApplicantEdit).omit('locked')
     form_fields['passport'].custom_widget = EncodingImageFileWidget
@@ -501 +509 @@
     def update(self):
         if self.context.locked:
-            self.emitLockMessage()
+            self.redirect(self.url(self.context))
             return
         datepicker.need() # Enable jQuery datepicker in date fields.

main/waeup.sirp/trunk/src/waeup/sirp/applicants/container.py

@@ -52 +52 @@
     @property
     def local_roles(cls):
-        return ['waeup.local.ApplicationsOfficer']
+        return ['waeup.ApplicationsOfficer']
 
     def archive(self, app_ids=None):

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

@@ -26 +26 @@
 
 # Application permissions
-class ViewApplication(grok.Permission):
-    grok.name('waeup.viewApplication')
 
-class ViewFullApplication(grok.Permission):
-    grok.name('waeup.viewFullApplication')
+class HandleApplication(grok.Permission):
+    grok.name('waeup.handleApplication')
 
-class EditApplication(grok.Permission):
-    grok.name('waeup.editApplication')
+class ManageApplications(grok.Permission):
+    grok.name('waeup.manageApplications')
 
-class EditFullApplication(grok.Permission):
-    grok.name('waeup.editFullApplication')
-
-# Local roles
+# Local role
 class ApplicationOwner(grok.Role):
     grok.name('waeup.local.ApplicationOwner')
     grok.title(u'Application Owner')
-    grok.permissions('waeup.viewApplication', 'waeup.editApplication')
+    grok.permissions('waeup.handleApplication')
 
+# Global role
 class ApplicationsOfficer(grok.Role):
-    grok.name('waeup.local.ApplicationsOfficer')
+    grok.name('waeup.ApplicationsOfficer')
     grok.title(u'Applications Officer')
-    grok.permissions('waeup.viewFullApplication', 'waeup.editFullApplication')
+    grok.permissions('waeup.manageApplications', 'waeup.handleApplication')

main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py

@@ -39 +39 @@
     @property
     def local_roles(cls):
-        return ['waeup.local.ApplicationsOfficer']
+        return ['waeup.ApplicationsOfficer']
 
 class ApplicantsPlugin(grok.GlobalUtility):

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

@@ -57 +57 @@
     grok.permissions('waeup.manageUniversity', 'waeup.manageUsers',
                      'waeup.View', 'waeup.Public','waeup.manageACBatches',
-                     'waeup.manageDataCenter','waeup.managePortalSettings')
+                     'waeup.manageDataCenter','waeup.managePortalSettings',
+                     'waeup.manageApplications', 'waeup.handleApplication')
 
 def getRoles():

main/waeup.sirp/trunk/src/waeup/sirp/permissions.txt

@@ -29 +29 @@
 
     >>> sorted(list(getRoles()))
-    [(u'waeup.PortalManager', <waeup...PortalManager object at 0x...>), ...]
+    [(u'waeup.ApplicationsOfficer', <waeup.sirp.applicants.permissions.ApplicationsOfficer object at 0x...>), ...]
 
 :func:`getWAeUPRoles`
@@ -39 +39 @@
     >>> from waeup.sirp.permissions import getWAeUPRoles
     >>> len(list(getWAeUPRoles()))
-    2
+    3
 
     >>> len(list(getWAeUPRoles(also_local=True)))
@@ -53 +53 @@
     >>> from waeup.sirp.permissions import getWAeUPRoleNames
     >>> list(getWAeUPRoleNames())
-    [u'waeup.PortalManager', u'waeup.PortalUser']
+    [u'waeup.ApplicationsOfficer', u'waeup.PortalManager', u'waeup.PortalUser']