Changeset 1907 for WAeUP_SRP/trunk/Widgets.py

Timestamp:

16 Jun 2007, 14:09:52 (17 years ago)

Author:

joachim

Message:

error messages with variables cause no modifications to zodb

File:

• WAeUP_SRP/trunk/Widgets.py (modified) (4 diffs)

WAeUP_SRP/trunk/Widgets.py

@@ -510 +510 @@
             value = datastructure[widget_id].upper()
             err = 0
+            mapping = {}
             if len(value.split()) > 1:
                 err = 'Invalid Id, Id contains space(s).'
             elif self.portal_catalog(portal_type=portal_type_query,id=value):
                 brain = self.portal_catalog(portal_type=portal_type_query,id=value)[0]
-                err = 'An %s object with the Id %s already exists at %s.'\
-                      % (brain.portal_type,value,brain.getPath())
+                err = 'An ${portal_type} object with the Id ${id} already exists at ${path}.'
+                mapping = {'portal_type': brain.portal_type,
+                           'id': value,
+                           'path': brain.getPath(),
+                           }
             if err:
-                datastructure.setError(widget_id, err)
+                datastructure.setError(widget_id, err, mapping)
             else:
                 datamodel = datastructure.getDataModel()
@@ -1032 +1036 @@
         #import pdb;pdb.set_trace()
         err = 0
+        mapping = {}
         prefix= self.prefix
         if prefix.startswith('@'):
@@ -1108 +1113 @@
                     if self.reference == "jamb_reg_no":
                         if hasattr(self.portal_directories.students,s_id):
-                            err = "Please login with your Student Id %s and 10-digit PIN." % s_id
+                            err = "Please login with your Student Id ${id} and 10-digit PIN."
+                            mapping = {'id': s_id}
                             s_logger.info('%s/%s repeatedly checked admission with PIN %s' % (s_id,ref,pin_str))
                             break
@@ -1121 +1127 @@
                     s_logger.info('%s/%s has been created using PIN %s' % (s_id,ref,pin_str))
                 except:
-                    err = "Please login with your Student Id %s and 10-digit PIN." % s_id
+                    err = "Please login with your Student Id ${id} and 10-digit PIN."
+                    mapping = {'id': s_id}
                     s_logger.info('%s/%s could not be made a member with PIN %s' % (s_id,ref,pin_str))
                     break
             break
         if err:
-            datastructure.setError(widget_id, err)
+            datastructure.setError(widget_id, err,mapping)
         else:
             datamodel = datastructure.getDataModel()