Changeset 14283 for main

Timestamp:

17 Nov 2016, 14:16:13 (8 years ago)

Author:

Henrik Bettermann

Message:

Split update method.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (3 diffs)

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

@@ -3132 +3132 @@
         return result
 
-    def update(self,  *args, **kw):
-        form = self.request.form
+    def _update_scores(self, form, editable_tickets):
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.', '')
-        self.current_academic_session = grok.getSite()[
-            'configuration'].current_academic_session
-        if self.context.__parent__.__parent__.score_editing_disabled:
-            self.flash(_('Score editing disabled.'), type="warning")
-            self.redirect(self.url(self.context))
-            return
-        if not self.current_academic_session:
-            self.flash(_('Current academic session not set.'), type="warning")
-            self.redirect(self.url(self.context))
-            return
-        self.session_title = academic_sessions_vocab.getTerm(
-            self.current_academic_session).title
-        self.tickets = self._searchCatalog(self.current_academic_session)
-        editable_tickets = [
-            ticket for ticket in self.tickets if ticket.editable_by_lecturer]
-        if not self.tickets:
-            self.flash(_('No student found.'), type="warning")
-            self.redirect(self.url(self.context))
-            return
-        if not 'UPDATE_TABLE' in form and not 'UPDATE_FILE' in form:
-            return
         error = ''
-        if not editable_tickets:
-            return
         if 'UPDATE_FILE' in form:
             if form['uploadfile']:
@@ -3167 +3143 @@
                         _('Uploaded file contains illegal data. Ignored'),
                         type="danger")
-                    return
+                    return False
             else:
                 self.flash(
                     _('No file provided.'), type="danger")
-                return
+                return False
         else:
             formvals = dict(zip(form['sids'], form['scores']))
@@ -3198 +3174 @@
                     'updated (only integers are allowed): %s.' % error.strip(', ')),
                 type="danger")
-            return
-        self.flash(_('You successfully updated course results.'))
+        return True
+
+    def update(self,  *args, **kw):
+        form = self.request.form
+        self.current_academic_session = grok.getSite()[
+            'configuration'].current_academic_session
+        if self.context.__parent__.__parent__.score_editing_disabled:
+            self.flash(_('Score editing disabled.'), type="warning")
+            self.redirect(self.url(self.context))
+            return
+        if not self.current_academic_session:
+            self.flash(_('Current academic session not set.'), type="warning")
+            self.redirect(self.url(self.context))
+            return
+        self.session_title = academic_sessions_vocab.getTerm(
+            self.current_academic_session).title
+        self.tickets = self._searchCatalog(self.current_academic_session)
+        editable_tickets = [
+            ticket for ticket in self.tickets if ticket.editable_by_lecturer]
+        if not self.tickets:
+            self.flash(_('No student found.'), type="warning")
+            self.redirect(self.url(self.context))
+            return
+        if not 'UPDATE_TABLE' in form and not 'UPDATE_FILE' in form:
+            return
+        if not editable_tickets:
+            return
+        success = self._update_scores(form, editable_tickets)
+        if success:
+            self.flash(_('You successfully updated course results.'))
         return