Changeset 16218 for main

Timestamp:

28 Aug 2020, 08:04:20 (4 years ago)

Author:

Henrik Bettermann

Message:

Simplify course change.

File:

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

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

@@ -1107 +1107 @@
             dict(name=x, title=y) for x, y in allowed_transitions]
 
-    def saveCourses(self, changed_fields):
+    def saveCourses(self):
         """In custom packages we needed to customize the certificate
         select widget. We just save course1 and course2 if these customized
         fields appear in the form.
         """
-        error = None
-        return error, changed_fields
+        return None, []
 
     @action(_('Save'), style='primary')
@@ -1135 +1134 @@
         else:
             changed_fields = []
-        error, changed_fields = self.saveCourses(changed_fields)
+        error, changed_courses = self.saveCourses()
         if error:
-            self.flash(error)
-            return
+            self.flash(error, type='danger')
+            return
+        changed_fields += changed_courses
         if password:
             # Now we know that the form has no errors and can set password ...
@@ -1297 +1297 @@
         return
 
-    def saveCourses(self):
-        """In custom packages we needed to customize the certificate
-        select widget. We just save course1 and course2 if these customized
-        fields appear in the form.
-        """
-        return
-
     @action(_('Save'), style='primary')
     def save(self, **data):
@@ -1310 +1303 @@
             return
         self.applyData(self.context, **data)
-        error = self.saveCourses()
+        error, dummy = self.saveCourses()
         if error:
-            self.flash(error)
+            self.flash(error, type='danger')
             return
         self.flash(_('Form has been saved.'))
@@ -1359 +1352 @@
             return
         self.applyData(self.context, **data)
+        error, dummy = self.saveCourses()
+        if error:
+            self.flash(error, type='danger')
+            return
         state = IWorkflowState(self.context).getState()
         # This shouldn't happen, but the application officer