Changeset 6210

Timestamp:

28 May 2011, 10:56:27 (14 years ago)

Author:

Henrik Bettermann

Message:

Certificate codes must be unique. Check catalog when certificate are added. Flash the place if certificates exist.

To do: The certificate importer must also check for existing cerificate codes.

Location:

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

Files:

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

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

@@ -1338 +1338 @@
         certificate = createObject(u'waeup.Certificate')
         self.applyData(certificate, **data)
-
-        #try:
-        #    self.applyData(certificate, **data)
-        #except NoTransitionAvailableError:
-        #    self.status = Invalid('Review state cannot be changed to '
-        #                          'requested state: no such transition '
-        #                          'available in workflow.')
-        #    return
-
-        try:
-            self.context.certificates.addCertificate(certificate)
-        except KeyError:
-            self.status = Invalid('The name chosen already exists '
-                                  'in the database')
-            return
-        except DuplicationError:
-            self.status = Invalid('The name chosen already exists '
-                                  'in the database')
-            return
+        message = self.context.certificates.addCertificate(certificate)
+        self.flash(message)
         self.redirect(self.url(self.context, u'@@manage')+'#tab-3')
 

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

@@ -28 +28 @@
     """
     grok.site(IUniversity)
-    grok.name('certifcates_catalog')
+    grok.name('certificates_catalog')
     grok.context(ICertificate)
 
     code = grok.index.Field(attribute='code')
-    title = grok.index.Field(attribute='application_category')
+    application_category = grok.index.Field(attribute='application_category')
 
 class CertificateCoursesIndexes(grok.Indexes):

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

@@ -5 +5 @@
     ICertificateContainer, ICertificate)
 from zope.component.interfaces import IFactory
+from zope.catalog.interfaces import ICatalog
+from zope.component import getUtility
 from zope.interface import implementedBy
 
@@ -17 +19 @@
             raise TypeError('CertificateContainers contain only '
                             'ICertificate instances')
+        cat = getUtility(ICatalog, name='certificates_catalog')
+        results = list(cat.searchResults(code=(certificate.code,certificate.code)))
+        if results:
+            dep = results[0].__parent__.__parent__.longtitle()
+            fac = results[0].__parent__.__parent__.__parent__.longtitle()
+            return 'Certificate exists in %s / %s.' % (fac,dep)
         self[certificate.code] = certificate
-        return
+        return 'Certificate added.'
 
     def clear(self):