Changeset 2289 for WAeUP_SRP/base

Timestamp:

28 Sep 2007, 08:54:17 (17 years ago)

Author:

joachim

Message:

use WAeUPId Widget for Ids

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (3 diffs)
• Widgets.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -1032 +1032 @@
         res = self.portal_catalog(id=course_id)
         if not res:
-            return '', "No Course with ID: %s" % did
+            return '', "No Course with ID: %s" % course_id
         c = res[0].getObject()
         c.getContent().edit(mapping=mapping)
@@ -1368 +1368 @@
             validators[widget] = layout[widget].validate
         #import pdb;pdb.set_trace()
+        mode = "create"
         if edit:
-            importer_name = "mass_edit_%s" % name
-        else:
-            importer_name = "mass_create_%s" % name
+            mode = "edit"
+        importer_name = "mass_%(mode)s_%(name)s" % vars()
         importer = getattr(self, '%s' % importer_name,None)
         if importer is None:
@@ -1410 +1410 @@
             for k in import_keys:
                 #import pdb;pdb.set_trace()
-                if not validators[k](ds):
+                if not validators[k](ds,mode=mode):
                     error_string += " %s : %s" % (k,
                                                   self.translation_service(ds.getError(k),

WAeUP_SRP/base/Widgets.py

@@ -624 +624 @@
     def validate(self, datastructure, **kw):
         """Validate datastructure and update datamodel."""
-
+        mode = kw.get('mode','create')
         valid = CPSStringWidget.validate(self, datastructure, **kw)
         id_pat_str = r"\S"
@@ -642 +642 @@
             if len(value.split()) > 1:
                 err = 'Invalid Id, Id contains space(s).'
-            elif self.portal_catalog(portal_type=portal_type_query,id=value):
+            elif mode == "create" and\
+                          self.portal_catalog(portal_type=portal_type_query,id=value):
                 brain = self.portal_catalog(portal_type=portal_type_query,id=value)[0]
                 err = 'An ${portal_type} object with the Id ${id} already exists at ${path}.'