Merge pull request ROGUE-JCTD#157 from pjdufour/master

Multiple Fixes
davisc · Aug 28, 2015 · 1e7d39e · 1e7d39e
2 parents e3effbe + d2d47af
commit 1e7d39e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -12,7 +12,7 @@
     "ol3": "./bower-local/ol3",
     "angular-translate": "2.2.0",
     "angular-cookies": "1.2.21",
-    "jquery-sortable": "~0.9.11",
+    "jquery-sortable": "0.9.11",
     "blueimp-bootstrap-image-gallery": "3.0.1",
     "moment": "2.3.1",
     "bootstrap3-datetimepicker": "~2.1.11",

diff --git a/src/common/addlayers/ServerService.js b/src/common/addlayers/ServerService.js
@@ -538,7 +538,8 @@ var SERVER_SERVICE_USE_PROXY = true;
                 url = server.virtualServiceUrl;
               }
 
-              url += '?SERVICE=WMS&REQUEST=GetCapabilities';
+              var iqm = url.indexOf('?')
+              var url_getcaps = url + (iqm >= 0 ? (iqm-1 == url.length ? '' : '&') : '?') + 'SERVICE=WMS&REQUEST=GetCapabilities';
 
               server.populatingLayersConfig = true;
               var config = {};
@@ -549,7 +550,7 @@ var SERVER_SERVICE_USE_PROXY = true;
                 config.headers['Authorization'] = '';
               }
               // server hasn't been added yet, so specify the auth headers here
-              http_.get(url, config).then(function(xhr) {
+              http_.get(url_getcaps, config).then(function(xhr) {
                 if (xhr.status === 200) {
                   var response = parser.read(xhr.data);
                   if (goog.isDefAndNotNull(response.Capability) &&