Changeset 8099

Timestamp:

11 Apr 2012, 07:42:13 (13 years ago)

Author:

Henrik Bettermann

Message:

Define separator headlines on clearance forms.

Catch ConstraintNotSatisfied? exception if selected level is wrong.

Location:

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

Files:

• browser/templates/default_waeup_display_form.pt (modified) (1 diff)
• students/browser.py (modified) (4 diffs)
• students/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/default_waeup_display_form.pt

@@ -1 +1 @@
 <table class="form-table">
   <tbody>
-    <tal:block repeat="widget view/widgets">
-      <tr>
-        <td class="fieldname">
-          <tal:block content="widget/label"/>:
-        </td>
-        <td>
-          <input tal:replace="structure widget" />
-        </td>
-      </tr>
-    </tal:block>
+    <tal:widgets content="structure provider:widgets" />
     <tal:files content="structure provider:files" />
   </tbody>

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

@@ -27 +27 @@
 from zope.catalog.interfaces import ICatalog
 from zope.component import queryUtility, getUtility, createObject
+from zope.schema.interfaces import ConstraintNotSatisfied
 from zope.formlib.textwidgets import BytesDisplayWidget
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
@@ -407 +408 @@
 
     @property
+    def separators(self):
+        return getUtility(IStudentsUtils).SEPARATORS_DICT
+
+    @property
     def form_fields(self):
         cm = getattr(self.context,'current_mode', None)
@@ -469 +474 @@
     label = _('Manage clearance data')
     pnav = 4
+
+    @property
+    def separators(self):
+        return getUtility(IStudentsUtils).SEPARATORS_DICT
 
     @property
@@ -634 +643 @@
     @action(_('Save'), style='primary')
     def save(self, **data):
-        msave(self, **data)
+        try:
+            msave(self, **data)
+        except ConstraintNotSatisfied:
+            # The selected level might not exist in certificate
+            self.flash(_('Current level not available for certificate.'))
+            return
         notify(grok.ObjectModifiedEvent(self.context.__parent__))
         return

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -385 +385 @@
         'C': 'Student on probation',
         }
+
+    SEPARATORS_DICT = {
+        }