Changeset 7275

Timestamp:

5 Dec 2011, 07:20:41 (13 years ago)

Author:

Henrik Bettermann

Message:

Redirect to contact form after rejecting clearance and pre-fill subject line.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (4 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -20 +20 @@
 import sys
 import grok
+from urllib import urlencode
 from time import time
 from datetime import datetime
@@ -363 +364 @@
     grok.context(IStudent)
     grok.name('contactstudent')
-    grok.require('waeup.manageStudent')
+    grok.require('waeup.viewStudent')
     pnav = 4
     title = 'Contact'
     form_fields = grok.AutoFields(IContactForm).select('subject', 'body')
+
+    def update(self, subject=u''):
+        self.form_fields.get('subject').field.default = subject
+        self.subject = subject
+        return
 
     def label(self):
@@ -567 +573 @@
         if self.context.state == CLEARED:
             IWorkflowInfo(self.context).fireTransition('reset4')
-            self.flash('Clearance has been annulled.')
+            message = 'Clearance has been annulled'
+            self.flash(message)
         elif self.context.state == REQUESTED:
             IWorkflowInfo(self.context).fireTransition('reset3')
-            self.flash('Clearance request has been rejected.')
+            message = 'Clearance request has been rejected'
+            self.flash(message)
         else:
             self.flash('Student is in the wrong state.')
-        self.redirect(self.url(self.context,'view_clearance'))
+            return
+        args = {'subject':message}
+        self.redirect(self.url(self.context) +
+            '/contactstudent?%s' % urlencode(args))
         return
 
     def render(self):
-        self.redirect(self.url(self.context, 'view_clearance'))
         return
 
@@ -1752 +1762 @@
     def requestClearance(self, **data):
         self.applyData(self.context, **data)
-        self.context._p_changed = True
+        #self.context._p_changed = True
         if self.dataNotComplete():
             self.flash(self.dataNotComplete())

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

@@ -736 +736 @@
         self.browser.getLink("Reject clearance").click()
         self.assertTrue('Clearance has been annulled' in self.browser.contents)
+        urlmessage = 'Clearance+has+been+annulled'
+        self.assertEqual(self.browser.url, self.student_path +
+            '/contactstudent?subject=%s' % urlmessage)
         self.assertTrue('State: <span>clearance started</span>'
             in self.browser.contents)