Changeset 7454 for main/waeup.sirp/branches/henrik-bootstrap/src/waeup

Timestamp:

12 Jan 2012, 11:53:01 (13 years ago)

Author:

Henrik Bettermann

Message:

Show student id and state in breadcrumbs bar.

All tests pass. Ready to merge branch with trunk.

Location:

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp

Files:

• browser/templates/staffsitelayout.pt (modified) (1 diff)
• students/tests/test_browser.py (modified) (2 diffs)

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/browser/templates/staffsitelayout.pt

@@ -45 +45 @@
             tal:condition="python: layout.isAuthenticated()"
             tal:content="structure provider:breadcrumbs" />
+      <span tal:condition="layout/getStudentName" class="wfstatus">
+            Student Id:
+          <span tal:replace="python:context.getStudent().student_id">Id
+          </span>&nbsp;&nbsp;
+          State:
+          <span tal:replace="python:context.getStudent().state">State
+          </span>
+      </span>
     </ul>
 

main/waeup.sirp/branches/henrik-bootstrap/src/waeup/sirp/students/tests/test_browser.py

@@ -922 +922 @@
         self.assertEqual(self.browser.url, self.student_path +
             '/contactstudent?subject=%s' % urlmessage)
-        self.assertTrue('State: <span>school fee paid</span>'
-            in self.browser.contents)
+        self.assertTrue('school fee paid' in self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('register_courses')
         self.browser.open(L110_student_path)
@@ -929 +928 @@
         self.assertTrue('Course list request has been rejected'
             in self.browser.contents)
-        self.assertTrue('State: <span>school fee paid</span>'
-            in self.browser.contents)
+        self.assertTrue('school fee paid' in self.browser.contents)
         # CA does now see the contact form and can send a message
         self.browser.getControl(name="form.subject").value = 'Important subject'