fix combo and set label error

UmSenhorQualquer · Apr 26, 2019 · 3c3b708 · 3c3b708
1 parent 5a4618d
commit 3c3b708
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pyforms_web/controls/control_combo.py b/pyforms_web/controls/control_combo.py
@@ -78,7 +78,7 @@ def value(self):
     @value.setter
     def value(self, value):
         for i, (key, val) in enumerate(self._items.items()):
-            value = self._types[i](value) if value is not None else None
+            value = None if value is None or value=='' else self._types[i](value)
             if value == val:
                 if self._value != value:
                     self._value = value

diff --git a/pyforms_web/web/static/pyforms.js b/pyforms_web/web/static/pyforms.js
diff --git a/pyforms_web/web/static/pyformsjs/ControlBase.js b/pyforms_web/web/static/pyformsjs/ControlBase.js
@@ -135,7 +135,7 @@ class ControlBase{
     @param {string} value - Label to set.
     */
     set_label(value){
-        $( "#"+this.place_id()+' label' ).first().html(value);
+        $( `#${this.place_id()} label[for='${this.control_id()}']` ).first().html(value);
     }
 
     ////////////////////////////////////////////////////////////////////////////////