Merge pull request #111 from diging/task/CCP-155

[CCP-128] when adding concept, id is first added before concept is
diging · Jul 14, 2016 · 612f359 · 612f359
2 parents 1b47244 + aa21d9f
commit 612f359
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/servlet/core/impl/ConceptManager.java b/Conceptpower+Spring/src/main/java/edu/asu/conceptpower/servlet/core/impl/ConceptManager.java
@@ -381,11 +381,11 @@ public String addConceptListEntry(ConceptEntry entry)
 			throw new DictionaryModifyException();
 		}
 
-		indexService.insertConcept(entry);
 		String id = generateId(CONCEPT_PREFIX);
 		entry.setId(id);
 		client.store(entry, DBNames.DICTIONARY_DB);
-		return id;
+		indexService.insertConcept(entry);
+        return id;
 
 	}
 

diff --git a/Conceptpower+Spring/src/main/webapp/WEB-INF/views/home.jsp b/Conceptpower+Spring/src/main/webapp/WEB-INF/views/home.jsp
@@ -7,6 +7,7 @@
 <%@ page session="false"%>
 
 <script type="text/javascript">
+//# sourceURL=details.js
 $(document).ready(function() {
    $('#conceptSearchResult').dataTable({
 		"bJQueryUI" : true,