Changeset 10684

Timestamp:

2 Nov 2013, 08:50:58 (11 years ago)

Author:

Henrik Bettermann

Message:

We do not need IFacultyAdd. A simple omit('code') does the same job.

Location:

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

Files:

• browser/interfaces.py (modified) (1 diff)
• browser/pages.py (modified) (3 diffs)
• university/faculty.py (modified) (2 diffs)
• university/interfaces.py (modified) (2 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, IFacultyAdd, IDepartment, IDepartmentAdd,
+    IFacultiesContainer, IFaculty, IDepartment, IDepartmentAdd,
     ICoursesContainer, ICourse, ICourseAdd, ICertificatesContainer,
     ICertificate, ICertificateAdd, ICertificateCourse, ICertificateCourseAdd)

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

@@ -46 +46 @@
     KofaDisplayFormPage, NullValidator)
 from waeup.kofa.browser.interfaces import (
-    IUniversity, IFacultiesContainer, IFaculty, IFacultyAdd,
+    IUniversity, IFacultiesContainer, IFaculty,
     IDepartment, IDepartmentAdd, ICourse, ICourseAdd, ICertificate,
     ICertificateAdd, ICertificateCourse, ICertificateCourseAdd,
@@ -1748 +1748 @@
     grok.name('add')
     label = _('Add faculty')
-    form_fields = grok.AutoFields(IFacultyAdd)
+    form_fields = grok.AutoFields(IFaculty)
     pnav = 1
 
@@ -1800 +1800 @@
     tabthreeactions2 = [_('Add local role')]
 
-    form_fields = grok.AutoFields(IFaculty)
+    form_fields = grok.AutoFields(IFaculty).omit('code')
 
     @property

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

@@ -25 +25 @@
 from waeup.kofa.interfaces import IKofaUtils
 from waeup.kofa.university.interfaces import (
-    IFaculty, IFacultyAdd, IDepartment)
+    IFaculty, IDepartment)
 
 def longtitle(inst):
@@ -38 +38 @@
     """A university faculty.
     """
-    grok.implements(IFaculty, IFacultyAdd)
+    grok.implements(IFaculty)
 
     local_roles = [

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

@@ -39 +39 @@
         default = u'NA',
         required = True,
-        readonly = True,
         )
 
@@ -55 +54 @@
         )
 
-
-class IFacultyAdd(IFaculty):
-    """Representation of a university faculty.
-    """
-    code = schema.TextLine(
-        title = _(u'Code'),
-        description = _(u'This code will become part of the URL.'),
-        default = u'NA',
-        required = True,
-        readonly = False,
-        )
-
-IFacultyAdd['code'].order =  IFaculty['code'].order
 
 class IFacultiesContainer(IKofaContainer):