Merge pull request #2412 from meghaarora42/fix-multiselect-issue

Change multiselect cache structure
railsadminteam · Sep 28, 2015 · 974b572 · 974b572
2 parents c4ab2fe + 8afc20d
commit 974b572
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js b/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
@@ -194,10 +194,10 @@
 
       this.element.find("option").each(function(i, option) {
         if (option.selected) {
-          widget._cache[option.value] = option.innerHTML;
+          widget._cache['o_' + option.value] = {id: option.value, value: option.innerHTML};
           $(option).clone().appendTo(widget.selection).attr("selected", false).attr("title", $(option).text());
         } else {
-          widget._cache[option.value] = option.innerHTML;
+          widget._cache['o_' + option.value] = {id: option.value, value: option.innerHTML};
           $(option).clone().appendTo(widget.collection).attr("selected", false).attr("title", $(option).text());
         }
       });
@@ -220,7 +220,8 @@
         if (!this.options.xhr) {
           for (i in this._cache) {
             if (this._cache.hasOwnProperty(i)) {
-              matches.push({id: i, label: this._cache[i]});
+              option = this._cache[i];
+              matches.push({id: option.id, label: option.value});
             }
           }
           success.apply(this, [matches]);
@@ -246,8 +247,9 @@
           query = new RegExp(query + '.*', 'i');
 
           for (i in this._cache) {
-            if (this._cache.hasOwnProperty(i) && query.test(this._cache[i])) {
-              matches.push({id: i, label: this._cache[i]});
+            if (this._cache.hasOwnProperty(i) && query.test(this._cache[i]['value'])) {
+              option = this._cache[i];
+              matches.push({id: option.id, label: option.value});
             }
           }