Changeset 10685

Timestamp:

2 Nov 2013, 09:02:26 (11 years ago)

Author:

Henrik Bettermann

Message:

Remove other redundant interfaces, see previous revision.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/interfaces.py (modified) (1 diff)
• browser/pages.py (modified) (9 diffs)
• university/certificate.py (modified) (2 diffs)
• university/course.py (modified) (2 diffs)
• university/department.py (modified) (2 diffs)
• university/interfaces.py (modified) (8 diffs)

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

@@ -24 +24 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.university.interfaces import (
-    IFacultiesContainer, IFaculty, IDepartment, IDepartmentAdd,
-    ICoursesContainer, ICourse, ICourseAdd, ICertificatesContainer,
-    ICertificate, ICertificateAdd, ICertificateCourse, ICertificateCourseAdd)
+    IFacultiesContainer, IFaculty, IDepartment,
+    ICoursesContainer, ICourse, ICertificatesContainer,
+    ICertificate, ICertificateCourse)
 
 class IBreadcrumb(Interface):

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

@@ -47 +47 @@
 from waeup.kofa.browser.interfaces import (
     IUniversity, IFacultiesContainer, IFaculty,
-    IDepartment, IDepartmentAdd, ICourse, ICourseAdd, ICertificate,
-    ICertificateAdd, ICertificateCourse, ICertificateCourseAdd,
+    IDepartment, ICourse, ICertificate,
+    ICertificateCourse,
     ICaptchaManager, IChangePassword)
 from waeup.kofa.browser.layout import jsaction, action, UtilityView
@@ -1904 +1904 @@
     grok.require('waeup.manageAcademics')
     label = _('Add department')
-    form_fields = grok.AutoFields(IDepartmentAdd)
+    form_fields = grok.AutoFields(IDepartment)
     pnav = 1
 
@@ -1977 +1977 @@
     tabfouractions2 = [_('Add local role')]
 
-    form_fields = grok.AutoFields(IDepartment)
+    form_fields = grok.AutoFields(IDepartment).omit('code')
 
     @property
@@ -2058 +2058 @@
     grok.require('waeup.manageAcademics')
     label = _(u'Add course')
-    form_fields = grok.AutoFields(ICourseAdd)
+    form_fields = grok.AutoFields(ICourse)
     pnav = 1
 
@@ -2099 +2099 @@
     grok.require('waeup.manageAcademics')
     label = _(u'Add certificate')
-    form_fields = grok.AutoFields(ICertificateAdd)
+    form_fields = grok.AutoFields(ICertificate)
     pnav = 1
 
@@ -2163 +2163 @@
     tabtwoactions2 = [_('Add local role')]
 
-    form_fields = grok.AutoFields(ICourse)
+    form_fields = grok.AutoFields(ICourse).omit('code')
 
     def update(self):
@@ -2224 +2224 @@
     label = _('Edit certificate')
 
-    form_fields = grok.AutoFields(ICertificate)
+    form_fields = grok.AutoFields(ICertificate).omit('code')
 
     pnav = 1
@@ -2283 +2283 @@
     grok.name('addcertificatecourse')
     grok.require('waeup.manageAcademics')
-    form_fields = grok.AutoFields(ICertificateCourseAdd)
+    form_fields = grok.AutoFields(ICertificateCourse)
     pnav = 1
     label = _('Add certificate course')
@@ -2336 +2336 @@
     grok.name('manage')
     grok.require('waeup.manageAcademics')
-    form_fields = grok.AutoFields(ICertificateCourse)
+    form_fields = grok.AutoFields(ICertificateCourse).omit('code')
     label = _('Edit certificate course')
     pnav = 1

main/waeup.kofa/trunk/src/waeup/kofa/university/certificate.py

@@ -29 +29 @@
 from waeup.kofa.interfaces import IKofaPluggable
 from waeup.kofa.university.interfaces import (
-    ICertificate, ICertificateAdd, ICertificateCourse)
+    ICertificate, ICertificateCourse)
 from waeup.kofa.university.vocabularies import course_levels
 from waeup.kofa.utils.batching import VirtualExportJobContainer
@@ -40 +40 @@
     """A certificate.
     """
-    grok.implements(ICertificate, ICertificateAdd)
+    grok.implements(ICertificate)
 
     local_roles = [

main/waeup.kofa/trunk/src/waeup/kofa/university/course.py

@@ -27 +27 @@
 from zope.component.interfaces import IFactory, ComponentLookupError
 from waeup.kofa.interfaces import IKofaPluggable
-from waeup.kofa.university.interfaces import ICourse, ICourseAdd
+from waeup.kofa.university.interfaces import ICourse
 from waeup.kofa.utils.batching import VirtualExportJobContainer
 
@@ -37 +37 @@
     """A university course.
     """
-    grok.implements(ICourse, ICourseAdd)
+    grok.implements(ICourse)
 
     local_roles = ['waeup.local.Lecturer']

main/waeup.kofa/trunk/src/waeup/kofa/university/department.py

@@ -30 +30 @@
 from waeup.kofa.interfaces import IKofaUtils, IKofaPluggable
 from waeup.kofa.utils.helpers import attrs_to_fields
-from waeup.kofa.university.interfaces import IDepartment, IDepartmentAdd
+from waeup.kofa.university.interfaces import IDepartment
 
 class VirtualDepartmentExportJobContainer(VirtualExportJobContainer):
@@ -39 +39 @@
     """A university department.
     """
-    grok.implements(IDepartment, IDepartmentAdd)
+    grok.implements(IDepartment)
 
     local_roles = [

main/waeup.kofa/trunk/src/waeup/kofa/university/interfaces.py

@@ -69 +69 @@
         default = u'NA',
         required = True,
-        readonly = True,
         )
 
@@ -97 +96 @@
 
 
-class IDepartmentAdd(IDepartment):
-    """Representation of a university department.
-    """
-    code = schema.TextLine(
-        title = _(u'Code'),
-        description = _(u'This code will become part of the URL.'),
-        default = u'NA',
-        required = True,
-        readonly = False,
-        )
-
-IDepartmentAdd['code'].order =  IDepartment['code'].order
-
 class ICoursesContainer(IKofaContainer):
     """A container for faculties.
@@ -126 +112 @@
         default = u'NA',
         required = True,
-        readonly = True,
         )
 
@@ -164 +149 @@
 
 
-class ICourseAdd(ICourse):
-    """Representation of a course.
-    """
-    code = schema.TextLine(
-        title = _(u'Code'),
-        description = _(u'Enter unique course code which will become part of the URL.'),
-        default = u'NA',
-        required = True,
-        readonly = False,
-        )
-
-ICourseAdd['code'].order =  ICourse['code'].order
-
 class ICertificate(IKofaObject):
     """Representation of a certificate.
@@ -184 +156 @@
         default = u'NA',
         required = True,
-        readonly = True,
         )
 
@@ -282 +253 @@
 
 
-class ICertificateAdd(ICertificate):
-    """Representation of a certificate.
-    """
-    code = schema.TextLine(
-        title = _(u'Code'),
-        default = u'NA',
-        description = _(u'Enter unique certificate code which will become part of the URL.'),
-        required = True,
-        readonly = False,
-        )
-
-ICertificateAdd['code'].order =  ICertificate['code'].order
-
 class ICertificatesContainer(IKofaContainer):
     """A container for certificates.
@@ -311 +269 @@
         title = _(u'Course'),
         source = CourseSource(),
-        readonly = True,
         )
 
@@ -332 +289 @@
         This is needed for cataloging.
         """
-
-class ICertificateCourseAdd(ICertificateCourse):
-    """A certificatecourse is referring a course and
-       provides some own attributes.
-    """
-    course = schema.Choice(
-        title = _(u'Course'),
-        source = CourseSource(),
-        readonly = False,
-        )
-
-ICertificateCourseAdd['course'].order =  ICertificateCourse['course'].order