Merge pull request #988 from lsmith77/fix-filters-always-as-query-par…

…ameters Fix filters always as query parameters
nelmio · Apr 28, 2017 · 572c69a · 572c69a
2 parents 3727d04 + 33307d7
commit 572c69a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
@@ -438,8 +438,10 @@
                         method = $('[name="header_method"]', this).val(),
                         self = this,
                         params = {},
+                        filters = {},
                         formData = new FormData(),
                         doubledParams = {},
+                        doubledFilters = {},
                         headers = {},
                         content = $(this).find('textarea.content').val(),
                         result_container = $('.result', $(this).parent());
@@ -527,6 +529,26 @@
 
 
 
+                    // retrieve all the filters to send
+                    $('.parameters .tuple.filter', $(this)).each(function() {
+                        var key, value;
+
+                        key = $('.key', $(this)).val();
+                        value = $('.value', $(this)).val();
+
+                        if (value) {
+                            // temporary save all additional/doubled parameters
+                            if (key in filters) {
+                                doubledFilters[key] = value;
+                            } else {
+                                filters[key] = value;
+                            }
+                        }
+                    });
+
+
+
+
                     // retrieve the additional headers to send
                     $('.headers .tuple', $(this)).each(function() {
                         var key, value;
@@ -575,6 +597,18 @@
                     }
                     {% endif %}
 
+                    //add filters as GET params and remove them from params
+                    if(method != 'GET'){
+                        for (var filterKey in $.extend({}, filters)){
+                            url += url.indexOf('?') > 0 ? '&' : '?';
+                            url += filterKey + '=' + filters[filterKey];
+
+                            if (params.hasOwnProperty(filterKey)){
+                                delete(params[filterKey]);
+                            }
+                        }
+                    }
+
                     // prepare final parameters
                     var body = {};
                     if(bodyFormat == 'json' && method != 'GET') {

diff --git a/Resources/views/method.html.twig b/Resources/views/method.html.twig
@@ -252,7 +252,7 @@
                                 {% if data.filters is defined %}
                                     <h4>Filters</h4>
                                     {% for name, infos in data.filters %}
-                                        <p class="tuple">
+                                        <p class="tuple filter">
                                             <input type="text" class="key" value="{{ name }}" placeholder="Key" />
                                             <span>=</span>
                                             <input type="text" class="value" placeholder="{% if infos.description is defined %}{{ infos.description }}{% else %}Value{% endif %}" {% if infos.default is defined %} value="{{ infos.default }}" {% endif %}/> <span class="remove">-</span>