Merge pull request #53 from diggyk/master

Added proper URL encoding of strings for queries
dropbox · Sep 28, 2015 · 0002671 · 0002671
2 parents 62c8c91 + 04dc2fb
commit 0002671
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/hermes/version.py b/hermes/version.py
@@ -1 +1 @@
-__version__ = "0.4.3"
+__version__ = "0.4.5"
diff --git a/hermes/webapp/src/js/controllers/questStatusCtrl.js b/hermes/webapp/src/js/controllers/questStatusCtrl.js
@@ -111,9 +111,9 @@
 
             if (vm.queryInput) {
                 options['filterByQuery'] = vm.queryInput;
-                $location.search('byFilter', vm.queryInput, false);
+                $location.search('byQuery', vm.queryInput, false);
             } else {
-                $location.search('byFilter', null, false);
+                $location.search('byQuery', null, false);
             }
 
             hermesService.getOpenQuests(options).then(function (questData) {

diff --git a/hermes/webapp/src/js/services/hermesService.js b/hermes/webapp/src/js/services/hermesService.js
@@ -107,19 +107,19 @@
             var url = "/api/v1/labors/?open=true&expand=hosts&limit=all&expand=quests&expand=events&expand=eventtypes";
 
             if (options['filterByOwner']) {
-                url += "&userQuery=" + options['filterByOwner'];
+                url += "&userQuery=" + encodeURIComponent(options['filterByOwner']);
             }
 
             if (options['filterByQuery']) {
-                url += "&hostQuery=" + options['filterByQuery'];
+                url += "&hostQuery=" + encodeURIComponent(options['filterByQuery']);
             }
 
             if (options['filterByCategory']) {
-                url += "&category=" + options['filterByCategory']
+                url += "&category=" + encodeURIComponent(options['filterByCategory']);
             }
 
             if (options['filterByState']) {
-                url += "&state=" + options['filterByState']
+                url += "&state=" + encodeURIComponent(options['filterByState']);
             }
 
             return $http.get(url)
@@ -146,11 +146,11 @@
             var url = "/api/v1/quests?filterClosed=true&progressInfo=true&expand=hosts&expand=labors&limit=all";
 
             if (options['filterByCreator']) {
-                url += "&byCreator=" + options['filterByCreator'];
+                url += "&byCreator=" + encodeURIComponent(options['filterByCreator']);
             }
 
             if (options['filterByQuery']) {
-                url += "&hostQuery=" + options['filterByQuery'];
+                url += "&hostQuery=" + encodeURIComponent(options['filterByQuery']);
             }
 
             return $http.get(url)
@@ -486,7 +486,7 @@
          * @returns {*}
          */
         function runQuery(queryString) {
-            return $http.get("/api/v1/extquery?query=" + queryString)
+            return $http.get("/api/v1/extquery?query=" + encodeURIComponent(queryString))
                 .then(runQueryComplete)
                 .catch(runQueryFailed);