Changeset 7114

Timestamp:

15 Nov 2011, 11:13:38 (13 years ago)

Author:

Henrik Bettermann

Message:

Don't use a general StudentBaseEditFormPage? for students, use dedicated forms instead for password editing and file upload. The files upload page is only used for the passport picture in the base package.

Location:

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

Files:

• browser/static/actionicon_key.png (added)
• browser/static/actionicon_portrait.png (added)
• students/browser.py (modified) (4 diffs)
• students/browser_templates/filesuploadpage.pt (added)
• students/interfaces.py (modified) (1 diff)
• students/tests/test_authentication.py (modified) (2 diffs)
• students/viewlets.py (modified) (2 diffs)

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

@@ -1448 +1448 @@
 # Pages for students only
 
-class StudentBaseEditActionButton(ManageActionButton):
+class StudentPasswordActionButton(ManageActionButton):
     grok.order(1)
     grok.context(IStudent)
     grok.view(StudentBaseDisplayFormPage)
     grok.require('waeup.handleStudent')
+    icon = 'actionicon_key.png'
     text = 'Change password'
-    target = 'bedit'
+    target = 'change_password'
+
+class StudentPassportActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.handleStudent')
+    icon = 'actionicon_portrait.png'
+    text = 'Change portrait'
+    target = 'change_portrait'
 
 class StudentPasswordSetting(grok.Adapter):
@@ -1481 +1491 @@
     password = property(getPassword, setPassword)
 
-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', 'reg_number', 'matric_number')
+class StudentPasswordFormPage(WAeUPEditFormPage):
+    """ View to edit the password by student
+    """
+    grok.context(IStudent)
+    grok.name('change_password')
+    grok.require('waeup.handleStudent')
     form_fields = grok.AutoFields(IStudentPasswordSetting)
     grok.template('baseeditpage')
@@ -1496 +1504 @@
 
     def update(self):
-        super(StudentBaseEditFormPage, self).update()
+        super(StudentPasswordFormPage, self).update()
         self.wf_info = IWorkflowInfo(self.context)
         return
@@ -1524 +1532 @@
         return
 
+class StudentFilesUploadPage(WAeUPPage):
+    """ View to upload files by student
+    """
+    grok.context(IStudent)
+    grok.name('change_portrait')
+    grok.require('waeup.handleStudent')
+    grok.template('filesuploadpage')
+    label = 'Upload portrait'
+    title = 'Base Data'
+    pnav = 4
+
 class StudentClearanceStartActionButton(ManageActionButton):
     grok.order(1)

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

@@ -65 +65 @@
     """Data needed for password setting.
     """
-    name = schema.TextLine(
-        title = u'Full Name',
-        default = u'Nobody',
-        required = True,
-        readonly = True
-        )
 
     password = schema.Password(

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

@@ -5 +5 @@
 ## $Id$
 ## 
-## Copyright (C) 2011 Uli Fouquet
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -173 +173 @@
         self.assertRaises(
             Unauthorized,
-            self.browser.open, self.student_path + '/bedit')
+            self.browser.open, self.student_path + '/change_password')
         return

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

@@ -10 +10 @@
     StudentClearanceDisplayFormPage, StudentClearanceManageFormPage,
     write_log_message, StudentBaseManageFormPage, StudentBaseDisplayFormPage,
-    StudentBaseEditFormPage)
+    StudentFilesUploadPage)
 from waeup.sirp.students.interfaces import IStudent, IStudentClearance
 
@@ -325 +325 @@
     """Passport upload viewlet for students.
     """
-    grok.view(StudentBaseEditFormPage)
+    grok.view(StudentFilesUploadPage)
     grok.require('waeup.handleStudent')