Changeset 12610 for main

Timestamp:

13 Feb 2015, 08:31:21 (10 years ago)

Author:

Henrik Bettermann

Message:

Add utility view to move department via UI.

Location:

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

Files:

• students/tests/test_move.py (modified) (2 diffs)
• utils/browser.py (modified) (2 diffs)

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

@@ -33 +33 @@
         department = self.app['faculties']['fac1']['dep1']
         faculty = self.app['faculties']['fac1']
-        department.moveDepartment('fac1', 'newdep')
+
+        # We move the depart using the UtilityView
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open('http://localhost/app/faculties/fac1/dep1/move_department?fac=fac1&dep=newdep')
 
         # New department is created and old department is removed
         self.assertEqual(
-            [key for key in self.app['faculties']['fac1']],
-            ['newdep'])
+            [key for key in self.app['faculties']['fac1']], ['newdep'])
 
         # All subobjects have been moved too
@@ -79 +81 @@
         assert len(results) == 1
         assert results[0] is self.app['students'][self.student_id]
+
+        # Messages are found in two log files
         logfile = os.path.join(
             self.app['datacenter'].storage, 'logs', 'students.log')
         logcontent = open(logfile).read()
-        self.assertTrue('INFO - system - K1000000 - Department moved'
+        self.assertTrue('INFO - zope.mgr - K1000000 - Department moved'
+            in logcontent)
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'main.log')
+        logcontent = open(logfile).read()
+        self.assertTrue('INFO - zope.mgr - Department dep1 moved to fac1/newdep'
             in logcontent)
 

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

@@ -24 +24 @@
 from waeup.kofa.browser.layout import UtilityView
 from waeup.kofa.interfaces import IObjectHistory
-
 from waeup.kofa.interfaces import IUniversity
+from waeup.kofa.university.interfaces import IDepartment
 
 def replaceStudentMessages(old, new):
@@ -199 +199 @@
         self.redirect(self.url(self.context, '@@index'))
         return
+
+
+class MoveDepartment(UtilityView, grok.View):
+    """ View to move a department.
+
+    """
+    grok.context(IDepartment)
+    grok.name('move_department')
+    grok.require('waeup.managePortal')
+
+    def update(self,fac=None, dep=None):
+        if None in (fac, dep):
+            self.flash('Syntax: /move_department?fac=[new faculty code]&dep=[new department code]')
+            return
+        oldcode = self.context.code
+        try:
+            self.context.moveDepartment(fac, dep)
+        except:
+            self.flash('Error')
+            return
+        grok.getSite().logger.info(
+            "Department %s moved to %s/%s" % (oldcode, fac, dep))
+        self.flash('Finished')
+        return
+
+    def render(self):
+        self.redirect(self.url(self.context, '@@index'))
+        return