Merge e92a2f0 into 04f9e56

lightblue-platform · Apr 27, 2015 · bfd6309 · bfd6309
2 parents 04f9e56 + e92a2f0
commit bfd6309
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/common/src/main/webapp/js/lightblue-apps.js b/common/src/main/webapp/js/lightblue-apps.js
@@ -229,6 +229,7 @@ function callLightblue(uri, jsonData, method) {
     var request = $.ajax({
         type: method,
         url: metadataServicePath + uri,
+          contentType: "application/json",
         data: JSON.stringify(jsonData)
     });
 
@@ -253,6 +254,7 @@ function loadVersions() {
     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'];
diff --git a/data-mgmt/pom.xml b/data-mgmt/pom.xml
@@ -42,7 +42,7 @@
             <plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
-                <version>0.0.20</version>
+                <version>0.0.23</version>
                 <executions>
                     <execution>
                         <id>install node and npm</id>
@@ -122,4 +122,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>