Changeset 2433 for WAeUP_SRP/base/Widgets.py

Timestamp:

25 Oct 2007, 14:21:01 (17 years ago)

Author:

joachim

Message:

fixes for emailed problems

File:

• WAeUP_SRP/base/Widgets.py (modified) (3 diffs)

WAeUP_SRP/base/Widgets.py

@@ -488 +488 @@
     def _getLGAs(self):
         voc = getattr(self.portal_vocabularies,self.vocabulary)
+        if getattr(self,'_v_states',None) is not None and\
+           getattr(self,'_v_lgas',None) is not None and\
+           getattr(self,'_v_d',None) is not None:
+            return (_v_d,_v_states,_v_lgas)
         states = []
         lgas  = []
@@ -506 +510 @@
                 lgas.append(lga)
             d[k] = v
-
+        self._v_d = d
+        self._v_state = state
+        self._v_lga = lga
         return (d,states,lgas)
 
@@ -521 +527 @@
         v = v.lower()
         combined,states,lgas = self._getLGAs()
-        one_field = False
-        if len(v) == 0:
-            pass
-        elif not self.state_field and not self.lga_field:
-            one_field = True
-            if v not in combined.keys():
+        datamodel = datastructure.getDataModel()
+        if not self.state_field and not self.lga_field:
+            if len(v) == 0 and self.is_required:
+                datastructure.setError(widget_id, "%s required" % widget_id)
+                return 0
+            elif v not in combined.keys():
                 datastructure.setError(widget_id, "'%s' not a valid lga key" % v)
                 return 0
-        else:
+            datamodel[self.fields[0]] = v
+        else:
+            state = datastructure.get(self.state_field,"").lower()
+            lga = datastructure.get(self.lga_field,"").lower()
             if widget_id == self.state_field:
-                if v not in states:
+                if state not in states:
                     datastructure.setError(widget_id, "'%s' not a valid state" % v)
                     return 0
             elif widget_id == self.lga_field:
-                if "_".join(re.split('\W+',v)) not in lgas:
+                if lga not in lgas:
                     datastructure.setError(widget_id, "'%s' not a valid lga" % v)
                     return 0
-                if datastructure[self.state_field]:
-                    v = datastructure[self.state_field] + '_' + v
-
-        if self.is_required and not len(v):
-            datastructure.setError(widget_id, "lga required")
-            return 0
-
-        datamodel = datastructure.getDataModel()
-        if one_field:
-            datamodel[self.fields[0]] = v
-        else:
-            state = datastructure[self.state_field].lower()
-            lga = "_".join(datastructure[self.lga_field].lower().split())
+            if len(state) == 0 or len(lga) == 0:
+                datastructure.setError(widget_id, "state AND lga must be given")
+                return 0
             datamodel[self.fields[0]] =   state + "_" + lga
         return 1