Changeset 13349 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

26 Oct 2015, 14:35:35 (9 years ago)

Author:

Henrik Bettermann

Message:

Tell the student which data are missing.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -2314 +2314 @@
     @property
     def all_required_fields_filled(self):
-        if self.context.email and self.context.phone:
-            return True
-        return False
+        if not self.context.email:
+            return _("Email address is missing.")
+        if not self.context.phone:
+            return _("Phone number is missing.")
+        return
 
     @property
@@ -2334 +2336 @@
             self.redirect(self.url(self.context, 'change_portrait'))
             return
-        if not self.all_required_fields_filled:
-            self.flash(_("Not all required fields filled."), type="warning")
+        arf_warning = self.all_required_fields_filled
+        if arf_warning:
+            self.flash(arf_warning, type="warning")
             self.redirect(self.url(self.context, 'edit_base'))
             return

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -2413 +2413 @@
         # Uups, we forgot to fill the phone fields
         self.browser.getControl("Start clearance").click()
-        self.assertMatches('...Not all required fields filled...',
+        self.assertMatches('...Phone number is missing...',
                            self.browser.contents)
         self.browser.open(self.student_path + '/edit_base')