Changeset 13431 for main/waeup.kofa/trunk/src/waeup/kofa/browser

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/browser

Files:

• pages.py (modified) (3 diffs)
• viewlets.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'