Merge branch 'development'

usc-isi-i2 · Jun 20, 2014 · 252dc6e · 252dc6e
2 parents 6bb1279 + 9e6b495
commit 252dc6e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/karma-web/src/main/java/edu/isi/karma/webserver/KarmaServlet.java b/karma-web/src/main/java/edu/isi/karma/webserver/KarmaServlet.java
@@ -143,6 +143,7 @@ protected void doGet(HttpServletRequest request,
 			@Override
 			public void generateJson(String prefix, PrintWriter pw,
 					VWorkspace vWorkspace) {
+				UIConfiguration.Instance().loadConfig();
 				pw.println("{");
 				pw.println("\"updateType\": \"UISettings\", ");
 				pw.println("\"settings\": {");

diff --git a/karma-web/src/main/webapp/js/semanticTypes.js b/karma-web/src/main/webapp/js/semanticTypes.js
@@ -834,7 +834,7 @@ var SetSemanticTypeDialog = (function() {
 	                        $(rowToChange).data("ResourceType", "Class").data("FullType",uri).data("DisplayLabel",properCasedKey);
 	                        displayLabel = $(rowToChange).data("DisplayLabel");
 	                    } else {
-	                        $(rowToChange).data("DomainUri",uri).data("DomainId", foundObj.uri).data("DisplayDomainLabel",properCasedKey);
+	                        $(rowToChange).data("DomainUri",uri).data("DomainId", classData.id).data("DisplayDomainLabel",properCasedKey);
 	                        displayLabel = "<span class='italic'>" + propertyOld + "</span> of " + $(rowToChange).data("DisplayDomainLabel");
 	                    }
 	                }

diff --git a/karma-web/src/main/webapp/version.jsp b/karma-web/src/main/webapp/version.jsp
@@ -1 +1 @@
-v2.018
+v2.019