Changeset 7330

Timestamp:

11 Dec 2011, 14:03:36 (13 years ago)

Author:

Henrik Bettermann

Message:

See last revision. Do the same for applicants.

Do not show select box for payment ticket removal if state doesn't allow to remove any ticket.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py (modified) (13 diffs)

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

@@ -39 +39 @@
 from waeup.sirp.browser.layout import NullValidator
 from waeup.sirp.browser.pages import add_local_role, del_local_roles
-from waeup.sirp.browser.resources import datepicker, tabs, datatable
+from waeup.sirp.browser.resources import datepicker, tabs, datatable, warning
 from waeup.sirp.browser.viewlets import ManageActionButton, PrimaryNavTab
+from waeup.sirp.browser.layout import jsaction, JSAction
 from waeup.sirp.interfaces import (
     ISIRPObject, ILocalRolesAssignable, IExtFileStore,
@@ -57 +58 @@
     MAX_UPLOAD_SIZE, IApplicantOnlinePayment,
     )
-from waeup.sirp.applicants.workflow import INITIALIZED, STARTED, PAID
+from waeup.sirp.applicants.workflow import INITIALIZED, STARTED, PAID, SUBMITTED
 from waeup.sirp.students.viewlets import PrimaryStudentNavTab
 from waeup.sirp.students.interfaces import IStudentsUtils
@@ -98 +99 @@
         tabs.need()
         datatable.need()
+        warning.need()
         return super(ApplicantsRootManageFormPage, self).update()
 
@@ -114 +116 @@
         return get_users_with_local_roles(self.context)
 
-    # ToDo: Show warning message before deletion
-    @grok.action('Remove selected')
+    @jsaction('Remove selected')
     def delApplicantsContainers(self, **data):
         form = self.request.form
@@ -339 +340 @@
         datepicker.need() # Enable jQuery datepicker in date fields.
         tabs.need()
+        warning.need()
         datatable.need()  # Enable jQurey datatables for contents listing
         return super(ApplicantsContainerManageFormPage, self).update()
@@ -362 +364 @@
         return
 
-    # ToDo: Show warning message before deletion
-    @grok.action('Remove selected')
+    @jsaction('Remove selected')
     def delApplicant(self, **data):
         form = self.request.form
@@ -820 +821 @@
     def update(self):
         datepicker.need() # Enable jQuery datepicker in date fields.
+        warning.need()
         super(ApplicantManageFormPage, self).update()
         self.wf_info = IWorkflowInfo(self.context)
@@ -888 +890 @@
 
     def unremovable(self, ticket):
-        usertype = getattr(self.request.principal, 'user_type', None)
-        if not usertype:
-            return False
-        return self.request.principal.user_type == 'applicant' and ticket.r_code
+        return False
 
     # This method is also used by the ApplicantEditFormPage
@@ -928 +927 @@
         return
 
-    @grok.action('Remove selected tickets')
+    @jsaction('Remove selected tickets')
     def removePaymentTickets(self, **data):
         self.delPaymentTickets(**data)
@@ -964 +963 @@
         return actions
 
+    def unremovable(self, ticket):
+        state = IWorkflowState(self.context).getState()
+        return ticket.r_code or state in (INITIALIZED, SUBMITTED)
+
     def emit_lock_message(self):
         self.flash('The requested form is locked (read-only).')
@@ -973 +976 @@
             self.emit_lock_message()
             return
-        datepicker.need() # Enable jQuery datepicker in date fields.
         super(ApplicantEditFormPage, self).update()
         return
@@ -993 +995 @@
         return
 
-    @grok.action('Remove selected tickets')
+    @jsaction('Remove selected tickets')
     def removePaymentTickets(self, **data):
         self.delPaymentTickets(**data)
@@ -1001 +1003 @@
     @grok.action('Save')
     def save(self, **data):
-        #import pdb; pdb.set_trace()
         if self.passport_changed is False:  # False is not None!
             return # error during image upload. Ignore other values