Changeset 13431 for main/waeup.kofa/trunk

Timestamp:

10 Nov 2015, 11:52:28 (9 years ago)

Author:

Henrik Bettermann

Message:

Put maintenance button on DatacenterImportStep1.

Location:

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

Files:

• browser/pages.py (modified) (3 diffs)
• browser/viewlets.py (modified) (2 diffs)
• doctests/batchprocessing_browser.txt (modified) (9 diffs)
• students/tests/test_browser.py (modified) (2 diffs)
• university/tests/test_batching.py (modified) (2 diffs)

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

@@ -1624 +1624 @@
 
     def update(self, back=None, finish=None, showlog=None):
+        if finish is not None:
+            self.redirect(self.url(self.context, '@@import1'))
+            return
         if not grok.getSite()['configuration'].maintmode_enabled_by and \
             not self.request.principal.id == 'admin':
@@ -1631 +1634 @@
                 type='danger')
             self.redirect(self.url(self.context))
-            return
-        if finish is not None:
-            self.redirect(self.url(self.context, '@@import1'))
             return
         session = ISession(self.request)['waeup.kofa']
@@ -1882 +1882 @@
             self.context.logger.info('%s - maintmode enabled' % ob_class)
             self.flash(_('Maintenance mode enabled.'), type='warning')
-        self.redirect(self.url(self.context))
+        self.redirect(self.url(self.context, 'import1'))
         return
 

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

@@ -26 +26 @@
     UniversityPage, FacultiesContainerPage, DatacenterPage, FacultyPage,
     DepartmentPage, CoursePage, CertificatePage, CertificateCoursePage,
-    UsersContainerPage, UserManageFormPage)
+    UsersContainerPage, UserManageFormPage, DatacenterImportStep1)
 from waeup.kofa.browser.interfaces import (
     IFacultiesContainer, IFaculty, IDepartment, ICourse, ICertificate,
@@ -631 +631 @@
     grok.context(IDataCenter)
     grok.require('waeup.importData')
-    grok.view(DatacenterPage)
+    grok.view(DatacenterImportStep1)
     grok.order(7)
     icon = 'actionicon_stop.png'

main/waeup.kofa/trunk/src/waeup/kofa/doctests/batchprocessing_browser.txt

@@ -86 +86 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Switch maintenance mode').click()
-    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Switch maintenance mode').click()
     >>> button = lookup_submit_value(
     ...   'select', 'faculties_zope.mgr.csv', browser)
@@ -100 +100 @@
     'Applicant Processor',
     'ApplicantsContainer Processor',
+    'Bed Processor (update only)',
     'CertificateCourse Processor',
     'Certificate Processor',
@@ -192 +193 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Switch maintenance mode').click()
-    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Switch maintenance mode').click()
     >>> button = lookup_submit_value(
     ...   'select', 'departments_zope.mgr.csv', browser)
@@ -258 +259 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Switch maintenance mode').click()
-    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Switch maintenance mode').click()
     >>> button = lookup_submit_value(
     ...   'select', 'courses_zope.mgr.csv', browser)
@@ -324 +325 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Switch maintenance mode').click()
-    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Switch maintenance mode').click()
     >>> button = lookup_submit_value(
     ...   'select', 'certificates_zope.mgr.csv', browser)
@@ -391 +392 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Switch maintenance mode').click()
-    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Switch maintenance mode').click()
     >>> button = lookup_submit_value(
     ...   'select', 'mycertcourses_zope.mgr.csv', browser)
@@ -458 +459 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Switch maintenance mode').click()
-    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Switch maintenance mode').click()
     >>> button = lookup_submit_value(
     ...   'select', 'users_zope.mgr.csv', browser)
@@ -545 +546 @@
 Step 1: start batch processing:
 
-    >>> browser.getLink('Switch maintenance mode').click()
-    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Switch maintenance mode').click()
     >>> button = lookup_submit_value(
     ...   'select', 'newfaculties_zope.mgr.csv', browser)
@@ -609 +610 @@
 
     >>> browser.open('http://localhost/app/datacenter')
-    >>> browser.getLink('Switch maintenance mode').click()
-    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Process data').click()
+    >>> browser.getLink('Switch maintenance mode').click()
     >>> button = lookup_submit_value(
     ...   'select', 'newfaculties_zope.mgr.create.pending.csv', browser)

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

@@ -1387 +1387 @@
         filewidget.add_file(filecontents, 'text/plain', 'students.csv')
         self.browser.getControl(name='SUBMIT').click()
+        self.browser.getLink('Process data').click()
         self.browser.getLink("Switch maintenance mode").click()
-        self.browser.getLink('Process data').click()
         button = lookup_submit_value(
             'select', 'students_zope.mgr.csv', self.browser)
@@ -1414 +1414 @@
         filewidget.add_file(filecontents, 'text/plain', 'studycourses.csv')
         self.browser.getControl(name='SUBMIT').click()
+        self.browser.getLink('Process data').click()
         # Meanwhile maintenance mode is disabled again.
         self.browser.getLink("Switch maintenance mode").click()
-        self.browser.getLink('Process data').click()
         button = lookup_submit_value(
             'select', 'studycourses_zope.mgr.csv', self.browser)

main/waeup.kofa/trunk/src/waeup/kofa/university/tests/test_batching.py

@@ -353 +353 @@
         self.assertTrue('Portal must be in maintenance mode for data import.'
             in self.browser.contents)
-        self.browser.open(self.datacenter_path)
         self.browser.getLink("Switch").click()
         self.assertTrue('Maintenance mode enabled' in self.browser.contents)
@@ -359 +358 @@
         self.assertEqual(
             self.app['configuration'].maintmode_enabled_by, 'zope.mgr')
-        self.browser.getLink('Process data').click()
         self.browser.getControl(name="select").click()
         importerselect = self.browser.getControl(name='importer')