Changeset 14286 for main/waeup.kofa/trunk

Timestamp:

17 Nov 2016, 21:27:49 (8 years ago)

Author:

Henrik Bettermann

Message:

Denote session in button.

Location:

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

Files:

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

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

@@ -34 +34 @@
 from waeup.kofa.interfaces import (
     IKofaUtils, IKofaObject,
-    IDataCenter, IUserAccount)
+    IDataCenter, IUserAccount,
+    academic_sessions_vocab)
 from waeup.kofa.utils.helpers import get_user_account
 
@@ -558 +559 @@
     grok.require('waeup.editScores')
     icon = 'actionicon_scores.png'
-    text = _('Update scores')
     target = 'edit_scores'
     grok.order(4)
+
+    @property
+    def target_url(self):
+        ca = grok.getSite()[
+            'configuration'].current_academic_session
+        if not ca:
+            return ''
+        return self.view.url(self.view.context, self.target)
+
+    @property
+    def text(self):
+        ca = grok.getSite()[
+            'configuration'].current_academic_session
+        st = academic_sessions_vocab.getTerm(ca).title
+        return _('Update session ${a} scores', mapping = {'a':st})
 
 

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

@@ -3191 +3191 @@
             self.current_academic_session).title
         self.tickets = self._searchCatalog(self.current_academic_session)
-        self.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
+        self.editable_tickets = [
+            ticket for ticket in self.tickets if ticket.editable_by_lecturer]
         if not 'UPDATE_TABLE' in form and not 'UPDATE_FILE' in form:
             return

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

@@ -3949 +3949 @@
         self.app['faculties']['fac1']['dep1'].score_editing_disabled = True
         self.browser.open(self.course_url)
-        self.browser.getLink("Update scores").click()
+        self.browser.getLink("Update session 2004/2005 scores").click()
         self.assertTrue('Score editing disabled' in self.browser.contents)
         self.app['faculties']['fac1']['dep1'].score_editing_disabled = False
         self.browser.open(self.course_url)
-        self.browser.getLink("Update scores").click()
+        self.browser.getLink("Update session 2004/2005 scores").click()
         self.assertFalse('Score editing disabled' in self.browser.contents)