Merge branch 'named-filter-forms'

Conflicts:
	flask_admin/model/base.py

examples/layout/templates/list.html

@@ -31,4 +31,4 @@
 {% endblock %}
 
 {% block model_menu_bar %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file

flask_admin/static/admin/js/filters.js

-var AdminFilters = function(element, filters_element, operations, options, types) {
+var AdminFilters = function(element, filters_element, filters_by_group) {
     var $root = $(element);
     var $container = $('.filters', $root);
     var lastCount = 0;
@@ -23,7 +23,7 @@ var AdminFilters = function(element, filters_element, operations, options, types
         return false;
     }
 
-    function addFilter(name, op) {
+    function addFilter(name, subfilters) {
         var $el = $('<tr />').appendTo($container);
 
         // Filter list
@@ -41,8 +41,8 @@ var AdminFilters = function(element, filters_element, operations, options, types
         var $select = $('<select class="filter-op" />')
                       .change(changeOperation);
 
-        $(op).each(function() {
-            $select.append($('<option/>').attr('value', this[0]).text(this[1]));
+        $(subfilters).each(function() {
+            $select.append($('<option/>').attr('value', this.label).text(this.operation));
         });
 
         $el.append(
@@ -51,16 +51,14 @@ var AdminFilters = function(element, filters_element, operations, options, types
 
         $select.select2({width: 'resolve'});
 
-        // Input
-        var optId = op[0][0];
-
         var $field;
 
-        if (optId in options) {
+        var firstFilter = subfilters[0];
+        if (firstFilter.options) {
             $field = $('<select class="filter-val" />')
-                        .attr('name', 'flt' + lastCount + '_' + optId);
+                        .attr('name', 'flt' + lastCount + '_' + firstFilter.label);
 
-            $(options[optId]).each(function() {
+            $(firstFilter.options).each(function() {
                 $field.append($('<option/>')
                     .val(this[0]).text(this[1]));
             });
@@ -70,13 +68,13 @@ var AdminFilters = function(element, filters_element, operations, options, types
         } else
         {
             $field = $('<input type="text" class="filter-val" />')
-                        .attr('name', 'flt' + lastCount + '_' + optId);
+                        .attr('name', 'flt' + lastCount + '_' + firstFilter.label);
             $el.append($('<td/>').append($field));
         }
 
-        if (optId in types) {
-            $field.attr('data-role', types[optId]);
-            faForm.applyStyle($field, types[optId]);
+        if (firstFilter.data_type) {
+            $field.attr('data-role', firstFilter.data_type);
+            faForm.applyStyle($field, firstFilter.data_type);
         }
 
         lastCount += 1;
@@ -84,8 +82,7 @@ var AdminFilters = function(element, filters_element, operations, options, types
 
     $('a.filter', filters_element).click(function() {
         var name = $(this).text().trim();
-
-        addFilter(name, operations[name]);
+        addFilter(name, filters_by_group[name]);
 
         $('button', $root).show();
 

flask_admin/templates/admin/model/layout.html

@@ -5,7 +5,7 @@
     <ul class="dropdown-menu field-filters">
         {% for k in filter_groups %}
         <li>
-            <a href="javascript:void(0)" class="filter" onclick="return false;">{{ k[0] }}</a>
+            <a href="javascript:void(0)" class="filter" onclick="return false;">{{ k }}</a>
         </li>
         {% endfor %}
     </ul>
@@ -23,29 +23,29 @@
         <table class="filters">
             {%- for i, flt in enumerate(active_filters) -%}
             <tr>
-                {% set filter = admin_view._filters[flt[0]] %}
+                {% set filter = filters[flt[0]] %}
+                {%- set filter_label = admin_view.unique_filter_label(filter) -%}
                 <td>
                     <a href="javascript:void(0)" class="btn remove-filter" title="{{ _gettext('Remove Filter') }}">
-                        <span class="close-icon">&times;</span>&nbsp;{{ filters[flt[0]] }}
+                        <span class="close-icon">&times;</span>&nbsp;{{ filter.name }}
                     </a>
                 </td>
                 <td>
                     <select class="filter-op" data-role="select2">
-                        {% for op in admin_view._filter_dict[filter.name] %}
-                        <option value="{{ op[0] }}"{% if flt[0] == op[0] %} selected="selected"{% endif %}>{{ op[1] }}</option>
+                        {% for subfilter in filter_groups[filter.name] %}
+                        <option value="{{ subfilter.label }}"{% if subfilter.label == filter_label %} selected="selected"{% endif %}>{{ subfilter.operation }}</option>
                         {% endfor %}
                     </select>
                 </td>
                 <td>
-                    {%- set data = filter_data.get(flt[0]) -%}
-                    {%- if data -%}
-                    <select name="flt{{ i }}_{{ flt[0] }}" class="filter-val" data-role="select2">
-                        {%- for d in data %}
-                        <option value="{{ d[0] }}"{% if flt[1] == d[0] %} selected{% endif %}>{{ d[1] }}</option>
+                    {%- if filter.options -%}
+                    <select name="flt{{ i }}_{{ filter_label }}" class="filter-val" data-role="select2">
+                        {%- for o in filter.options %}
+                        <option value="{{ o[0] }}"{% if flt[1] == o[0] %} selected{% endif %}>{{ o[1] }}</option>
                         {%- endfor %}
                     </select>
                     {%- else -%}
-                        <input name="flt{{ i }}_{{ flt[0] }}" type="text" value="{{ flt[1] or '' }}" class="filter-val"{% if flt[0] in filter_types %} data-role="{{ filter_types[flt[0]] }}"{% endif %}></input>
+                        <input name="flt{{ i }}_{{ filter_label }}" type="text" value="{{ flt[1] or '' }}" class="filter-val"{% if filter.data_type %} data-role="{{ filter.data_type }}"{% endif %}></input>
                     {%- endif -%}
                 </td>
             </tr>

flask_admin/templates/admin/model/list.html

@@ -157,12 +157,10 @@
                 html: true,
                 placement: 'bottom'
             });
-            {% if filter_groups is not none and filter_data is not none %}
+            {% if filter_groups is not none %}
                 var filter = new AdminFilters(
                     '#filter_form', '.field-filters',
-                    {{ admin_view._get_filter_dict()|tojson|safe }},
-                    {{ filter_data|tojson|safe }},
-                    {{ filter_types|tojson|safe }}
+                    {{ filter_groups|tojson|safe }}
                 );
             {% endif %}
         })(jQuery);

flask_admin/tests/sqlamodel/test_basic.py

@@ -233,61 +233,52 @@ def test_column_filters():
 
     eq_(len(view._filters), 4)
 
-    eq_(view._filter_dict, {
-        u'Test1': [
-            (0, u'equals'),
-            (1, u'not equal'),
-            (2, u'contains'),
-            (3, u'not contains')
-        ]})
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['Test1'] ],
+        [('0', u'equals'),
+         ('1', u'not equal'),
+         ('2', u'contains'),
+         ('3', u'not contains')])
 
     # Test filter that references property
     view = CustomModelView(Model2, db.session,
                            column_filters=['model1'])
 
-    eq_(view._filter_dict, {
-        u'Model1 / Test1': [
-            (0, u'equals'),
-            (1, u'not equal'),
-            (2, u'contains'),
-            (3, u'not contains')
-        ],
-        'Model1 / Test2': [
-            (4, 'equals'),
-            (5, 'not equal'),
-            (6, 'contains'),
-            (7, 'not contains')
-        ],
-        u'Model1 / Test3': [
-            (8, u'equals'),
-            (9, u'not equal'),
-            (10, u'contains'),
-            (11, u'not contains')
-        ],
-        u'Model1 / Test4': [
-            (12, u'equals'),
-            (13, u'not equal'),
-            (14, u'contains'),
-            (15, u'not contains')
-        ],
-        u'Model1 / Bool Field': [
-            (16, u'equals'),
-            (17, u'not equal'),
-        ],
-        u'Model1 / Enum Field': [
-            (18, u'equals'),
-            (19, u'not equal'),
-        ]})
+
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['Model1 / Test1'] ],
+        [('0', u'equals'),
+         ('1', u'not equal'),
+         ('2', u'contains'),
+         ('3', u'not contains')])
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['Model1 / Test2'] ],
+        [('4', u'equals'),
+         ('5', u'not equal'),
+         ('6', u'contains'),
+         ('7', u'not contains')])
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['Model1 / Test3'] ],
+        [('8', u'equals'),
+         ('9', u'not equal'),
+         ('10', u'contains'),
+         ('11', u'not contains')])
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['Model1 / Test4'] ],
+        [('12', u'equals'),
+         ('13', u'not equal'),
+         ('14', u'contains'),
+         ('15', u'not contains')])
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['Model1 / Bool Field'] ],
+        [('16', u'equals'),
+         ('17', u'not equal')])
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['Model1 / Enum Field'] ],
+        [('18', u'equals'),
+         ('19', u'not equal')])
+
 
     # Test filter with a dot
     view = CustomModelView(Model2, db.session,
                            column_filters=['model1.bool_field'])
 
-    eq_(view._filter_dict, {
-        'Model1 / Bool Field': [
-            (0, 'equals'),
-            (1, 'not equal'),
-        ]})
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['Model1 / Bool Field'] ],
+        [('0', u'equals'),
+         ('1', u'not equal')])
 
     # Fill DB
     model1_obj1 = Model1('model1_obj1', bool_field=True)
@@ -324,9 +315,11 @@ def test_column_filters():
                            column_filters=['int_field'])
     admin.add_view(view)
 
-    eq_(view._filter_dict, {'Int Field': [(0, 'equals'), (1, 'not equal'),
-                                          (2, 'greater than'), (3, 'smaller than')]})
-
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['Int Field'] ],
+        [('0', u'equals'),
+         ('1', u'not equal'),
+         ('2', u'greater than'),
+         ('3', u'smaller than')])
 
     #Test filters to joined table field
     view = CustomModelView(

flask_admin/tests/test_model.py

@@ -302,8 +302,8 @@ def test_column_filters():
     eq_(view._filters[0].name, 'col1')
     eq_(view._filters[1].name, 'col2')
 
-    eq_(view._filter_dict, {'col1': [(0, 'test')],
-                            'col2': [(1, 'test')]})
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['col1'] ], [('0', 'test')])
+    eq_([ (f['label'], f['operation']) for f in view._flattened_filters_by_group['col2'] ], [('1', 'test')])
 
     # TODO: Make calls with filters