dropdown on gis-search-form

upd upd#2 upd#3 merge commits merge commits
Flexberry · Nov 12, 2021 · 84ca092 · 84ca092
1 parent 714db6b
commit 84ca092
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/addon/controllers/gis-search-form.js b/addon/controllers/gis-search-form.js
@@ -280,18 +280,6 @@ export default Controller.extend({
         || (key >= 48 && key <= 57) || (key >= 96 && key <= 105));
     },
 
-    /**
-      Handles scale condition changing.
-
-      @method actions.onScaleConditionChange
-      @param {String} index Index of selected element.
-      @param {Object} element Selected element.
-      @param {String} value Selected value.
-    */
-    onScaleConditionChange(index, element, value) {
-      this.set(`searchConditions.scaleFilters.${index}.condition`, value);
-    },
-
     /**
       Handles click on row select checkbox.
 

diff --git a/app/templates/gis-search-form.hbs b/app/templates/gis-search-form.hbs
@@ -43,17 +43,11 @@
           <div class="scale-filters">
             {{#each searchConditions.scaleFilters as |filter index|}}
               <div class="scale-filter">
-              {{!-- {{#ui-dropdown class="compact selection" onChange=(action "onScaleConditionChange" index)}}
-                <i class="dropdown icon"></i>
-                <div class="text">
-                  {{filter.condition}}
-                </div>
-                <div class="menu">
-                  {{#each-in scaleFilterConditions as |key value|}}
-                    <div class="item" data-value="{{value}}">{{value}}</div>
-                  {{/each-in}}
-                </div>
-              {{/ui-dropdown}} --}}
+                {{flexberry-dropdown
+                  class="compact selection"
+                  items=scaleFilterConditions
+                  value=filter.condition
+                }}
               {{t "forms.gis-search-form.scale-prefix"}}
               {{flexberry-dropdown-input
                 items=scales