Changeset 6103 for main/waeup.sirp/trunk/src/waeup

Timestamp:

15 May 2011, 02:51:49 (14 years ago)

Author:

uli

Message:

• Make 'cancel' work in addform.
• Shorten attribute value computation.

File:

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

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

@@ -34 +34 @@
     WAeUPDisplayFormPage, NullValidator)
 from waeup.sirp.browser.breadcrumbs import Breadcrumb
+from waeup.sirp.browser.layout import NullValidator
 from waeup.sirp.browser.resources import datepicker, tabs, datatable
 from waeup.sirp.browser.viewlets import ManageActionButton, PrimaryNavTab
@@ -140 +141 @@
     pnav = 3
 
-    form_fields = grok.AutoFields(IApplicantsContainerAdd)
+    form_fields = grok.AutoFields(
+        IApplicantsContainerAdd).omit('code').omit('title')
     form_fields['startdate'].custom_widget = FriendlyDateWidget('le')
     form_fields['enddate'].custom_widget = FriendlyDateWidget('le')
@@ -146 +148 @@
     def update(self):
         datepicker.need() # Enable jQuery datepicker in date fields.
+        from waeup.sirp.browser.resources import jqueryui
+        jqueryui.need()
         return super(ApplicantsContainerAddFormPage, self).update()
 
     @grok.action('Add applicants container')
     def addApplicantsContainer(self, **data):
-        year1 = unicode(data['year'])
-        year2 = unicode(data['year']+1)
-        code = unicode(data['prefix']) + year1
-        title = unicode(application_types_vocab.getTerm(data['prefix']).title) + u' ' + year1 + u'/' + year2        
+        year = data['year']
+        code = u'%s%s' % (data['prefix'], year)
+        prefix = application_types_vocab.getTerm(data['prefix'])
+        title = u'%s %s/%s' % (prefix.title, year, year + 1)
         if code in self.context.keys():
-            self.status = Invalid('The code chosen already exists '
-                                  'in the database')
+            self.status = Invalid(
+                'Error: An applicants container for the same application '
+                'type and entrance year exists already in the database')
             return
         # Add new applicants container...
@@ -164 +169 @@
         container.code = code
         container.title = title
-        #import pdb; pdb.set_trace()
         self.context[code] = container
         self.flash('Added "%s".' % code)
@@ -170 +174 @@
         return
 
-    @grok.action('Cancel')
+    @grok.action('Cancel', validator=NullValidator)
     def cancel(self, **data):
-        self.redirect(self.url(self.context))
+        self.redirect(self.url(self.context, '@@manage') + '#tab-1')
 
 class ApplicantsRootBreadcrumb(Breadcrumb):