Changeset 6216

Timestamp:

29 May 2011, 09:23:30 (13 years ago)

Author:

Henrik Bettermann

Message:

Course codes must be unique. Check catalog when courses are added. Flash the place where course exists.

Location:

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

Files:

• browser/pages.py (modified) (1 diff)
• university/certificatecontainer.py (modified) (2 diffs)
• university/coursecontainer.py (modified) (2 diffs)

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

@@ -1303 +1303 @@
         course = createObject(u'waeup.Course')
         self.applyData(course, **data)
-        try:
-            self.context.courses.addCourse(course)
-        except KeyError:
-            self.status = Invalid('The code chosen already exists '
-                                  'in the database')
-            return
-        except DuplicationError:
-            self.status = Invalid('The code chosen already exists '
-                                  'in the database')
-            return
+        message = self.context.courses.addCourse(course)
+        self.flash(message)
         self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
 

main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.py

@@ -4 +4 @@
 from waeup.sirp.university.interfaces import (
     ICertificateContainer, ICertificate)
-from zope.component.interfaces import IFactory
+from zope.component.interfaces import IFactory, ComponentLookupError
 from zope.catalog.interfaces import ICatalog
 from zope.component import getUtility
@@ -19 +19 @@
             raise TypeError('CertificateContainers contain only '
                             'ICertificate instances')
-        cat = getUtility(ICatalog, name='certificates_catalog')
+        try:
+            cat = getUtility(ICatalog, name='certificates_catalog')
+        except ComponentLookupError:
+            # catalog not available. This might happen during tests.
+            self[certificate.code] = certificate
+            return 'Certificate added (for tests only).'
         results = list(cat.searchResults(code=(certificate.code,certificate.code)))
         if results:

main/waeup.sirp/trunk/src/waeup/sirp/university/coursecontainer.py

@@ -3 +3 @@
 import grok
 from zope.interface import implementedBy
-from zope.component.interfaces import IFactory
+from zope.component.interfaces import IFactory, ComponentLookupError
+from zope.catalog.interfaces import ICatalog
+from zope.component import getUtility
 from waeup.sirp.university.interfaces import ICourseContainer, ICourse
 
@@ -17 +19 @@
         if not ICourse.providedBy(course):
             raise TypeError('CourseContainers contain only ICourse instances')
+        try:
+            cat = getUtility(ICatalog, name='courses_catalog')
+        except ComponentLookupError:
+            # catalog not available. This might happen during tests.
+            self[course.code] = course
+            return 'Course added (for tests only).'
+        results = list(cat.searchResults(code=(course.code,course.code)))
+        if results:
+            dep = results[0].__parent__.__parent__.longtitle()
+            fac = results[0].__parent__.__parent__.__parent__.longtitle()
+            return 'Course exists already in %s / %s.' % (fac,dep)
         self[course.code] = course
-        return
+        return 'Course added.'
 
     def clear(self):