Changeset 5951 for main/waeup.sirp/trunk/src/waeup/sirp/browser

Timestamp:

15 Apr 2011, 14:07:35 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement 'Add' interfaces for Faculties, Departments, Courses and Certificates. The add methods are broken for the views which use these interfaces for form field generation. I don't know why.

Location:

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

Files:

• interfaces.py (modified) (2 diffs)
• pages.py (modified) (5 diffs)

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

@@ -6 +6 @@
     IWAeUPObject, IUniversity, IUserContainer, IDataCenter)
 from waeup.sirp.university.interfaces import (
-    IFacultyContainer, IFaculty, IDepartment, ICourseContainer, ICourse,
-    ICertificateContainer, ICertificate, ICertificateCourse, CourseSource)
-
+    IFacultyContainer, IFaculty, IFacultyAdd, IDepartment, IDepartmentAdd, 
+    ICourseContainer, ICourse, ICourseAdd, ICertificateContainer, 
+    ICertificate, ICertificateAdd, ICertificateCourse, ICertificateCourseAdd)
 class IBreadcrumb(Interface):
     """Provide breadcrumbs.
@@ -55 +55 @@
         """Get the list of breadcrumbs as real Python list.
         """
-        
-class ICertificateCourseAdd(ICertificateCourse):
-    """A certificatecourse is a course referenced by a certificate, which
-       provides some own attributes.
-    """
-    course = schema.Choice(
-        title = u'Course to be referenced',
-        source = CourseSource(),
-        readonly = False,
-        )
-    
-    level = schema.Int(
-        title = u'Level of this course',
-        required = True,
-        default = 100,
-        readonly = False,
-        )    
 
-    core_or_elective = schema.Bool(
-        title = u'Is mandatory course (not elective)',
-        required = True,
-        default = True
-        )        

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

@@ -33 +33 @@
     WAeUPDisplayFormPage, NullValidator)
 from waeup.sirp.browser.interfaces import (
-    IUniversity, IFacultyContainer, IFaculty, IDepartment, ICourse,
-    ICertificate, ICertificateCourse, ICertificateCourseAdd)
+    IUniversity, IFacultyContainer, IFaculty, IFacultyAdd, 
+    IDepartment, IDepartmentAdd, ICourse, ICourseAdd, ICertificate,
+    ICertificateAdd, ICertificateCourse, ICertificateCourseAdd)
 from waeup.sirp.catalog import search_context
 from waeup.sirp.interfaces import(
@@ -864 +865 @@
     label = ''
     title = 'Add faculty'
-    pnav = 1
-    
-    # We need a deepcopy here, because otherwise also all other
-    # IFaculty forms would be affected.
-    form_fields = copy.deepcopy(grok.AutoFields(IFaculty))
-    form_fields.get('code').field.readonly = False    
+    form_fields = grok.AutoFields(IFacultyAdd)
+    pnav = 1
 
     @grok.action('Add faculty')
@@ -929 +926 @@
     title = 'Add department'
     label = ''
-    pnav = 1
-    
-    # We need a deepcopy here, because otherwise also all other
-    # IDepartment forms would be affected.
-    form_fields = copy.deepcopy(grok.AutoFields(IDepartment))
-    form_fields.get('code').field.readonly = False
+    form_fields = grok.AutoFields(IDepartmentAdd)
+    pnav = 1
     
     @grok.action('Add department')
@@ -1055 +1048 @@
     grok.require('waeup.manageUniversity')
     title = u'Add course'
-    pnav = 1
-    
-    # We need a deepcopy here, because otherwise also all other
-    # ICourse forms would be affected.
-    form_fields = copy.deepcopy(grok.AutoFields(ICourse))
-    form_fields.get('code').field.readonly = False
-
+    form_fields = grok.AutoFields(ICourseAdd)
+    pnav = 1
+    
     @grok.action('Add course')
     def addCourse(self, **data):
@@ -1090 +1079 @@
     grok.require('waeup.manageUniversity')
     title = u'Add certificate'
-    pnav = 1
-    
-    # We need a deepcopy here, because otherwise also all other
-    # ICertificate forms would be affected.
-    form_fields = copy.deepcopy(grok.AutoFields(ICertificate))
-    form_fields.get('code').field.readonly = False
+    form_fields = grok.AutoFields(ICertificateAdd)
+    pnav = 1
+    
         
     @grok.action('Add certificate')