Merge b4a746d into 74ae58c

lightblue-platform · Mar 30, 2015 · 3a68a7f · 3a68a7f
2 parents 74ae58c + b4a746d
commit 3a68a7f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/common/src/main/webapp/js/lightblue-apps.js b/common/src/main/webapp/js/lightblue-apps.js
@@ -229,6 +229,7 @@
       var request = $.ajax({
           type: method,
           url: metadataServicePath + uri,
+          contentType: "application/json",
           data: JSON.stringify(jsonData)
       });
 
@@ -253,6 +254,7 @@
       var request = $.ajax({
           type: "GET",
           url: metadataServicePath + "health",
+          contentType: "application/json",
           dataType: "html"
       });
 

diff --git a/common/src/main/webapp/js/lightblue-config.js b/common/src/main/webapp/js/lightblue-config.js
@@ -1 +1 @@
-var metadataServicePath = "/app/metadata/rest-request/";
+var metadataServicePath = "rest-request/";
diff --git a/common/src/main/webapp/js/lightblue-roles.js b/common/src/main/webapp/js/lightblue-roles.js
@@ -0,0 +1,2 @@
+// This file will be loaded only if RolesServlet isn't. Useful for development without a servlet container.
+window.roles = ['lightblue-metadata-admin', 'authenticated'];