fix: the query string is not appended to the end of the url if an act…

…ion is specified
grappendorf · Sep 28, 2015 · fa19188 · fa19188
1 parent 70b6dd5
commit fa19188
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/grapp-rest-resource.html b/grapp-rest-resource.html
@@ -175,12 +175,15 @@
     _prepareUrl: function(path, query, params, id, action) {
       var name, url, value;
       url = this.baseUrl ? this.baseUrl + path : path;
-      if (query) {
-        url += '?' + query;
-      }
       if (typeof params === 'string') {
         params = JSON.parse(params);
       }
+      if (action) {
+        url += "/" + action;
+      }
+      if (query) {
+        url += '?' + query;
+      }
       for (name in params) {
         value = params[name];
         url = url.replace(":" + name, value);
@@ -189,9 +192,6 @@
       url = url.replace(/\/\/+/g, '/');
       url = url.replace(/^(\w+):\//, '$1://');
       url = url.replace(/\/$/, '');
-      if (action) {
-        url += "/" + action;
-      }
       return url;
     },
     _prepareHeaders: function() {

diff --git a/src/grapp-rest-resource.coffee b/src/grapp-rest-resource.coffee
@@ -79,16 +79,16 @@ Polymer
 
   _prepareUrl: (path, query, params, id, action) ->
     url = if @baseUrl then @baseUrl + path else path
-    url += '?' + query if query
     params = JSON.parse(params) if typeof(params) == 'string'
+    if action
+      url += "/#{action}"
+    url += '?' + query if query
     for name, value of params
       url = url.replace ":#{name}", value
     url = url.replace ':id', id || ''
     url = url.replace /\/\/+/g, '/'
     url = url.replace /^(\w+):\//, '$1://'
     url = url.replace /\/$/, ''
-    if action
-      url += "/#{action}"
     url
 
   _prepareHeaders: ->

diff --git a/test/query.html b/test/query.html
@@ -53,7 +53,7 @@
         request.respond 200, {'Content-Type': 'application/json'}, '"request-with-special-index-query"'
       @server.respondWith 'GET', '/data?type=show', (request) ->
         request.respond 200, {'Content-Type': 'application/json'}, '"request-with-special-show-query"'
-      @server.respondWith 'GET', '/data?type=new', (request) ->
+      @server.respondWith 'GET', '/data/new?type=new', (request) ->
         request.respond 200, {'Content-Type': 'application/json'}, '"request-with-special-new-query"'
       @server.respondWith 'POST', '/data?type=create', (request) ->
         request.respond 200, {'Content-Type': 'application/json'}, '"request-with-special-create-query"'