Changeset 7538 for main/waeup.sirp/trunk/src/waeup/sirp

Timestamp:

30 Jan 2012, 10:17:13 (13 years ago)

Author:

Henrik Bettermann

Message:

We do no longer need special interfaces for student access (IStudentPersonalEdit, IStudentClearanceEdit). Data access can be controlled by pages.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• browser_templates/studylevelpage.pt (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• student.py (modified) (2 diffs)

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

@@ -52 +52 @@
     IStudentsContainer, IStudent, IStudentClearance,
     IStudentPersonal, IStudentBase, IStudentStudyCourse,
-    IStudentAccommodation, IStudentClearanceEdit, IStudentStudyLevel,
+    IStudentAccommodation, IStudentStudyLevel,
     ICourseTicket, ICourseTicketAdd, IStudentPaymentsContainer,
     IStudentOnlinePayment, IBedTicket, IStudentsUtils, IStudentChangePassword
@@ -642 +642 @@
         return '%s: Personal Data' % self.context.display_fullname
 
-class StudentPersonalManageActionButton(ManageActionButton):
+class StudentPersonalEditActionButton(ManageActionButton):
     grok.order(1)
     grok.context(IStudent)
     grok.view(StudentPersonalDisplayFormPage)
-    grok.require('waeup.manageStudent')
-    text = 'Manage'
+    grok.require('waeup.viewStudent')
+    text = 'Edit'
     target = 'edit_personal'
 
@@ -1855 +1855 @@
     grok.require('waeup.handleStudent')
     form_fields = grok.AutoFields(
-        IStudentClearanceEdit).omit('clearance_locked')
+        IStudentClearance).omit('clearance_locked')
     label = 'Edit clearance data'
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelpage.pt

@@ -61 +61 @@
 
 <div tal:condition="python: not len(context.keys())">
-There no levels registered yet.
+There no tickets added yet.
 </div>

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

@@ -441 +441 @@
     'p_item'].order
 
-# Interfaces for students only
-
-class IStudentClearanceEdit(IStudentClearance):
-    """Interface needed for restricted editing of student clearance data.
-
-    """
-
-class IStudentPersonalEdit(IStudentPersonal):
-    """Interface needed for restricted editing of student personal data.
-
-    """
-
 class IStudentChangePassword(ISIRPObject):
     """Interface needed for change pasword page.

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

@@ -31 +31 @@
 from waeup.sirp.image import SIRPImageFile
 from waeup.sirp.imagestorage import DefaultFileStoreHandler
-from waeup.sirp.students.interfaces import (
-    IStudent, IStudentNavigation, IStudentClearanceEdit,
-    IStudentPersonalEdit)
+from waeup.sirp.students.interfaces import IStudent, IStudentNavigation
 from waeup.sirp.students.studycourse import StudentStudyCourse
 from waeup.sirp.students.payments import StudentPaymentsContainer
@@ -44 +42 @@
     owned by students.
     """
-    grok.implements(IStudent, IStudentNavigation,
-        IStudentPersonalEdit, IStudentClearanceEdit)
+    grok.implements(IStudent, IStudentNavigation)
     grok.provides(IStudent)