Merge lp:~alastair-b/tiqit/dropdown-fix into lp:tiqit

[Alastair]

Improve handling for listboxes to cope with a default value which is not on the list of permitted values (instead set the value to the first permitted value).

Currently, when an editor object is retrieved with a set of permitted values, there is no checking to see if the default value is in the list of permitted values. When an attempt is made to set the editor.value to an invalid value, it ends up set to "" instead.

This change is twofold:
 1. update the editor object retrieval to set editor.value to the first valid value if an invalid default value is specified
 2. update the resetting to default value code in view.js to check if the attempt to set the editor value to the default value failed, and if it did, then restore the known good value which was set up initially when the editor object was retrieved.

This fixes the issue where updating the severity of a bug results in an empty "feature" field instead of the first valid value.

[lp:~alastair-b/tiqit/dropdown-fix]

15. By Alastair Palmer <email address hidden> on 2016-07-06

Review markups: use editor.input.value rather than editor.value.

Unmerged revisions

15. By Alastair Palmer <email address hidden> on 2016-07-06

Review markups: use editor.input.value rather than editor.value.

14. By Alastair Palmer <email address hidden> on 2016-07-04

Add handling for the case where the current value of a listbox is not a
permitted value. Instead of accepting the default behavior of the
object's value being set to "", check it and set it to the first known
good value instead.

=== modified file 'static/scripts/tiqit.js'
--- static/scripts/tiqit.js	2014-06-05 14:38:53 +0000
+++ static/scripts/tiqit.js	2016-07-06 12:08:12 +0000
@@ -547,6 +547,10 @@
  *
  * The returned object will have an 'input' field that is the actual input
  * object that values can be read from/set on, and can be disabled/enabled.
+ *
+ * If the editor object has a restricted set of values *and* a default value
+ * is passed in which is not a permitted value, then the editor's value will
+ * be set to the first item in the array of permitted values.
  */
 dropdownEditTypes = new Array('Text', 'Number');
 function getEditorCommon(field, name, defval, vals, search, rel, parentValFn) {
@@ -566,6 +570,11 @@
     }
     if (defval) {
       newVal.value = defval;
+
+      if (newVal.value != defval) {
+        // Failed to set value, try using the first element of the field
+        newVal.value = vals[0][0];
+      }
     }
 
     newVal.input = newVal;

=== modified file 'static/scripts/view.js' (properties changed: -x to +x)
--- static/scripts/view.js	2015-12-22 15:22:57 +0000
+++ static/scripts/view.js	2016-07-06 12:08:12 +0000
@@ -563,6 +563,7 @@
     var editor;
     var value;
     var parent;
+    var old_safe_value;
 
     for (child in field.childfields) {
         // Generate a new dropdown box with the correct allowed values based
@@ -587,7 +588,15 @@
 
             // Go back to the default value if we are not a checkbox
             if (!(field.childfields[child].nodeName == 'INPUT' && field.childfields[child].type == 'checkbox')) {
+                // Store the current editor value as we know that it's valid.
+                old_safe_value = editor.input.value;
                 editor.input.value = old_editor.input.defaultValue;
+
+                if (editor.input.value != old_editor.input.defaultValue) {
+                    // If the current default value couldn't be set (i.e. it's not a valid value) then restore the
+                    // old safe value.
+                    editor.input.value = old_safe_value;
+                }
             }
            
             // Add the event listener(s) updateChildrenView and checkFormValidity