Merge branch 'hotfix-gl-dropdown-field-undefined' into 'master'

Fixes protected branches not removing active item ## What does this MR do? Fixes an problem where protected branches weren't getting their active item removed on a second click because they dont have a field value. ## Why was this MR needed? Protected branches could not have their clicked items removed once clicked. See merge request !6440

Merge branch 'hotfix-gl-dropdown-field-undefined' into 'master'
5fdc1f11 · Rémy Coutable · 2450625b · 2c4fe74b · 5fdc1f11
Commit 5fdc1f11 authored Sep 22, 2016 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

gl_dropdown.js app/assets/javascripts/gl_dropdown.js +8 -7

No files found.
--- a/app/assets/javascripts/gl_dropdown.js
+++ b/app/assets/javascripts/gl_dropdown.js
@@ -608,27 +608,28 @@
        }
      }
      field = [];
-      fieldName = typeof this.options.fieldName === 'function' ? this.options.fieldName(selectedObject) : this.options.fieldName;
      value = this.options.id ? this.options.id(selectedObject, el) : selectedObject.id;
      if (isInput) {
        field = $(this.el);
      } else if(value) {
        field = this.dropdown.parent().find("input[name='" + fieldName + "'][value='" + value.toString().replace(/'/g, '\\\'') + "']");
      }
-      if (field.length && el.hasClass(ACTIVE_CLASS)) {
+      if (el.hasClass(ACTIVE_CLASS)) {
        el.removeClass(ACTIVE_CLASS);
+        if (field && field.length) {
          if (isInput) {
            field.val('');
          } else {
            field.remove();
          }
+        }
      } else if (el.hasClass(INDETERMINATE_CLASS)) {
        el.addClass(ACTIVE_CLASS);
        el.removeClass(INDETERMINATE_CLASS);
-        if (field.length && value == null) {
+        if (field && field.length && value == null) {
          field.remove();
        }
-        if (!field.length && fieldName) {
+        if ((!field || !field.length) && fieldName) {
          this.addInput(fieldName, value, selectedObject);
        }
      } else {
@@ -638,15 +639,15 @@
            this.dropdown.parent().find("input[name='" + fieldName + "']").remove();
          }
        }
-        if (field.length && value == null) {
+        if (field && field.length && value == null) {
          field.remove();
        }
        // Toggle active class for the tick mark
        el.addClass(ACTIVE_CLASS);
        if (value != null) {
-          if (!field.length && fieldName) {
+          if ((!field || !field.length) && fieldName) {
            this.addInput(fieldName, value, selectedObject);
-          } else if (field.length) {
+          } else if (field && field.length) {
            field.val(value).trigger('change');
          }
        }