Changeset 7834

Timestamp:

11 Mar 2012, 09:17:32 (13 years ago)

Author:

Henrik Bettermann

Message:

Cancel needs no form validation.

Simplify StudyLevelBreadcrumb?.

Location:

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

Files:

• browser/pages.py (modified) (2 diffs)
• students/browser.py (modified) (3 diffs)

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

@@ -1323 +1323 @@
         self.redirect(self.url(self.context, u'@@manage')+'?tab1')
 
-    @action(_('Cancel'))
+    @action(_('Cancel'), validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1439 +1439 @@
         self.redirect(self.url(self.context, u'@@manage')+'?tab2')
 
-    @action(_('Cancel'))
+    @action(_('Cancel'), validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))

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

@@ -34 +34 @@
 from waeup.kofa.browser import (
     KofaPage, KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage,
-    ContactAdminForm, KofaForm)
+    ContactAdminForm, KofaForm, NullValidator)
 from waeup.kofa.browser.interfaces import ICaptchaManager
 from waeup.kofa.browser.breadcrumbs import Breadcrumb
@@ -155 +155 @@
     @property
     def title(self):
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        # There is no request attribute, thus we can only translate
-        # to the default (portal) language
-        return translate(self.context.level_title, 'waeup.kofa',
-            target_language=portal_language)
+        return self.context.level_title
 
 class StudentsContainerPage(KofaPage):
@@ -886 +882 @@
         return
 
-    @action(_('Cancel'))
+    @action(_('Cancel'), validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))