Changeset 13913 for main/waeup.kofa/branches/uli-scores-upload/src/waeup

Timestamp:

11 Jun 2016, 09:21:50 (9 years ago)

Author:

uli

Message:

Move viewlets to students module.

I do not think we want imports from w.k.students in
w.k.browser.

Location:

main/waeup.kofa/branches/uli-scores-upload/src/waeup/kofa

Files:

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

main/waeup.kofa/branches/uli-scores-upload/src/waeup/kofa/browser/viewlets.py

@@ -27 +27 @@
     DepartmentPage, CoursePage, CertificatePage, CertificateCoursePage,
     UsersContainerPage, UserManageFormPage, DatacenterImportStep1)
-from waeup.kofa.students.browser import EditScoresPage
 from waeup.kofa.browser.interfaces import (
     IFacultiesContainer, IFaculty, IDepartment, ICourse, ICertificate,
@@ -555 +554 @@
     grok.order(4)
 
-class DownloadCSVFileActionButton(ManageActionButton):
-    """ 'Download csv file' button for courses.
-    """
-    grok.context(ICourse)
-    grok.view(EditScoresPage)
-    grok.name('downloadcsv')
-    grok.require('waeup.editScores')
-    icon = 'actionicon_down.png'
-    text = _('Download editable tickets')
-    target = 'download_scores'
-    grok.order(1)
-
-class DownloadTicketOverviewActionButton(ManageActionButton):
-    """ 'Download ticket overview' button for courses.
-    """
-    grok.context(ICourse)
-    grok.view(EditScoresPage)
-    grok.name('coursetickets')
-    grok.require('waeup.editScores')
-    icon = 'actionicon_pdf.png'
-    text = _('Download pdf file')
-    target = 'coursetickets.pdf'
-    grok.order(2)
 
 class ManageCertificateActionButton(ManageActionButton):

main/waeup.kofa/branches/uli-scores-upload/src/waeup/kofa/students/viewlets.py

@@ -36 +36 @@
     AccommodationManageFormPage, BedTicketDisplayFormPage,
     StudentClearanceEditFormPage, StudentPersonalEditFormPage,
-    PaymentsManageFormPage, StudyCourseTranscriptPage)
+    PaymentsManageFormPage, StudyCourseTranscriptPage, EditScoresPage)
 from waeup.kofa.students.interfaces import (
     IStudentsContainer, IStudent, IStudentStudyCourse, IStudentAccommodation,
@@ -42 +42 @@
     IStudentPaymentsContainer, IStudentsUtils
     )
+from waeup.kofa.university.interfaces import ICourse
 
 grok.context(IKofaObject) # Make IKofaObject the default context
@@ -803 +804 @@
             ]
         return targets
+
+class DownloadCSVFileActionButton(ManageActionButton):
+    """ 'Download csv file' button for courses.
+    """
+    grok.context(ICourse)
+    grok.view(EditScoresPage)
+    grok.name('downloadcsv')
+    grok.require('waeup.editScores')
+    icon = 'actionicon_down.png'
+    text = _('Download editable tickets')
+    target = 'download_scores'
+    grok.order(1)
+
+class DownloadTicketOverviewActionButton(ManageActionButton):
+    """ 'Download ticket overview' button for courses.
+    """
+    grok.context(ICourse)
+    grok.view(EditScoresPage)
+    grok.name('coursetickets')
+    grok.require('waeup.editScores')
+    icon = 'actionicon_pdf.png'
+    text = _('Download pdf file')
+    target = 'coursetickets.pdf'
+    grok.order(2)