Fix ValueMap widget to save key instead of value

opengisch · Mar 31, 2016 · 5d33573 · 5d33573
1 parent 445b610
commit 5d33573
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/qml/FeatureForm.qml b/src/qml/FeatureForm.qml
@@ -119,7 +119,7 @@ Rectangle {
               id: attributeEditorLoader
               anchors { left: parent.left; right: parent.right }
 
-              visible: form.state != "ReadOnly"
+              enabled: form.state != "ReadOnly"
               property var value: AttributeValue
               property var config: EditorWidgetConfig
 
@@ -136,11 +136,6 @@ Rectangle {
               onValueChanged: featureFormList.model.setAttribute( index, value, FeatureModel.AttributeValue )
             }
 
-            Text {
-              visible: form.state == "ReadOnly"
-              text: AttributeValue || 'N/A'
-            }
-
             Controls.CheckBox {
               id: rememberValueCheckbox
 

diff --git a/src/qml/editorwidgets/ValueMap.qml b/src/qml/editorwidgets/ValueMap.qml
@@ -9,18 +9,24 @@ Item {
 
   height: childrenRect.height
 
+  property var _reverseConfig: ({})
+
   ComboBox {
     id: comboBox
 
-    currentIndex: find(value)
+    currentIndex: find(_reverseConfig[value])
 
     Component.onCompleted: {
       model = Object.keys(config);
-      currentIndex = find(value)
+      for(var key in config) {
+        _reverseConfig[json[key]] = key;
+      }
+
+      currentIndex = find(_reverseConfig[value])
     }
 
     onCurrentTextChanged: {
-      valueChanged( currentText )
+      valueChanged( config[currentText] )
     }
   }
 }