Changeset 6694 for main/waeup.sirp

Timestamp:

8 Sep 2011, 16:35:05 (13 years ago)

Author:

Henrik Bettermann

Message:

Add student base data edit page including interfaces and page template. This page will be only used for changing the password. All other data will be readonly for students.

The browser tests fail because students are being logged out after having changed the password. This shouldn't be.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• browser_templates/studentbaseeditpage.pt (added)
• interfaces.py (modified) (3 diffs)
• student.py (modified) (2 diffs)
• tests/test_browser.py (modified) (3 diffs)

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

@@ -65 +65 @@
     IStudentsContainer, IStudent, IStudentClearance,
     IStudentPersonal, IStudentBase, IStudentStudyCourse,
-    IStudentPayments, IStudentAccommodation, IStudentNavigation
+    IStudentPayments, IStudentAccommodation, IStudentNavigation,
+    IStudentBaseEdit, 
     )
 from waeup.sirp.students.student import Student
@@ -233 +234 @@
     grok.require('waeup.viewStudent')
     grok.template('studentpage')
-    form_fields = grok.AutoFields(IStudentBase)
+    form_fields = grok.AutoFields(IStudentBase).omit('password')
     pnav = 4
     title = 'Base Data'
@@ -447 +448 @@
     def label(self):
         return '%s: History' % self.context.name
+
+# Pages for students only
+
+class StudentBaseEditActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.handleStudent')
+    text = 'Change password'
+    target = 'bedit'
+
+class StudentBaseEditFormPage(WAeUPEditFormPage):
+    """ View to edit student base data by student
+    """
+    grok.context(IStudent)
+    grok.name('bedit')
+    grok.require('waeup.handleStudent')
+    form_fields = grok.AutoFields(IStudentBaseEdit).omit('student_id')
+    grok.template('studentbaseeditpage')
+    label = 'Change password'
+    title = 'Base Data'
+    pnav = 4
+
+    def update(self):
+        datepicker.need() # Enable jQuery datepicker in date fields.
+        super(StudentBaseEditFormPage, self).update()
+        self.wf_info = IWorkflowInfo(self.context)
+        return
+
+    @grok.action('Save')
+    def save(self, **data):
+        changed_fields = self.applyData(self.context, **data)
+        changed_fields = changed_fields.values()
+        fields_string = '+'.join(' + '.join(str(i) for i in b) for b in changed_fields)
+        self.context._p_changed = True
+        self.flash('Form has been saved.')
+        form = self.request.form
+        ob_class = self.__implemented__.__name__.replace('waeup.sirp.','')
+        if fields_string:
+            self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
+        if 'password' in fields_string:
+            IUserAccount(self.context).setPassword(form['form.password'])
+        return

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

@@ -61 +61 @@
     history = Attribute('Object history, a list of messages.')
     state = Attribute('Returns the registration state of a student')
-    student_id = Attribute('Randomly generated id')
+    #student_id = Attribute('Randomly generated id')
 
     def loggerInfo(ob_class, comment):
@@ -78 +78 @@
         )
 
-    password = schema.TextLine(
+    password = schema.Password(
         title = u'Password',
         )
@@ -126 +126 @@
     """
 
+# Interfaces for students only
+
+class IStudentBaseEdit(IStudentBase):
+    """Interface needed for editing of student base data by students.
+    """
+
+    name = schema.TextLine(
+        title = u'Full Name',
+        default = u'Nobody',
+        required = True,
+        readonly = True,
+        )
+
+IStudentBaseEdit['name'].order =  IStudentBase['name'].order
+
+class IStudentClearanceEdit(IStudentClearance):
+    """Interface needed for restricted editing of student clearance data.
+    """
+
+class IStudentPersonalEdit(IStudentPersonal):
+    """Interface needed for restricted editing of student personal data.
+    """

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

@@ -23 +23 @@
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from waeup.sirp.interfaces import IObjectHistory
-from waeup.sirp.students.interfaces import IStudent, IStudentNavigation
+from waeup.sirp.students.interfaces import (
+    IStudent, IStudentNavigation, IStudentBaseEdit,
+    )
 from waeup.sirp.utils.helpers import attrs_to_fields
 from waeup.sirp.students.utils import generate_student_id
@@ -31 +33 @@
     owned by students.
     """
-    grok.implements(IStudent, IStudentNavigation)
+    grok.implements(IStudent, IStudentNavigation,
+        IStudentBaseEdit)
     grok.provides(IStudent)
 

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

@@ -39 +39 @@
 from waeup.sirp.university.faculty import Faculty
 from waeup.sirp.university.department import Department
+from waeup.sirp.interfaces import IUserAccount
 
 PH_LEN = 2059  # Length of placeholder file
@@ -75 +76 @@
         student.name = u'Anna Tester'
         self.test_student_id = self.app['students'].addStudent(student)
-
+        # Set password
+        IUserAccount(self.app['students'][self.test_student_id]).setPassword('spwd')
+
+        self.login_path = 'http://localhost/app/login'
         self.container_path = 'http://localhost/app/students'
         self.manage_container_path = self.container_path + '/@@manage'
@@ -244 +248 @@
         self.assertMatches('...Student admitted by zope.mgr...',
                            self.browser.contents)
-
-        return
+        return
+
+    def test_student_access(self):
+        # Students can access their own objects
+        # and can perform actions
+
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.test_student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.assertEqual(self.browser.url, self.student_path)
+        self.assertTrue('You logged in' in self.browser.contents)
+        # Change password
+        self.browser.getLink("Change password").click()
+        self.browser.getControl(name="form.password").value = 'new_password'
+        self.browser.getControl("Save").click()
+        self.assertTrue('Form has been saved' in self.browser.contents)
+        # We are still logged in. Changing the password hasn't thrown us out.
+        self.browser.getLink("My Data").click()
+        self.assertEqual(self.browser.url, self.student_path)
+        # We can logout
+        self.browser.getLink("Logout").click()
+        self.assertTrue('You have been logged out' in self.browser.contents)
+        self.assertEqual(self.browser.url, 'http://localhost/app')
+        # We can login again with the new password
+        self.browser.getLink("Login").click()
+        #self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.test_student_id
+        self.browser.getControl(name="form.password").value = 'new_password'
+        self.browser.getControl("Login").click()
+        self.assertEqual(self.browser.url, self.student_path)
+        self.assertTrue('You logged in' in self.browser.contents)
+        return