added apostrophe escaping for vargrp, fixed editor inconsistency

ncrncornell · Jul 12, 2016 · 76609a7 · 76609a7
1 parent 53c955e
commit 76609a7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/Source/src/main/java/edu/ncrn/cornell/ced2ar/api/data/BaseX.java b/Source/src/main/java/edu/ncrn/cornell/ced2ar/api/data/BaseX.java
@@ -340,7 +340,7 @@ public static String httpGetWriter(String reqPrefix,String request){
 		c.buildRequest(RequestType.GET, reqPrefix, request);
 		c.writerAuthorize();
 		String s = c.execute();
-		c.close();		
+		c.close();
 		return s;		
 	}
 

diff --git a/Source/src/main/java/edu/ncrn/cornell/ced2ar/eapi/rest/queries/EditCodebookData.java b/Source/src/main/java/edu/ncrn/cornell/ced2ar/eapi/rest/queries/EditCodebookData.java
@@ -799,7 +799,6 @@ public int editVarMulti(String baseHandle, String version, String var,
 	public int editVarGrp(String baseHandle, String version, String id, 
 	String name, String labl, String txt){
 		//TODO: versioning for this
-
 		String handle = baseHandle+version;
 		String replaceStmt = "";	
 

diff --git a/Source/src/main/java/edu/ncrn/cornell/ced2ar/ei/controllers/EditVarGroups.java b/Source/src/main/java/edu/ncrn/cornell/ced2ar/ei/controllers/EditVarGroups.java
@@ -284,6 +284,7 @@ public String groupEditForm2P(@PathVariable(value = "c") String baseHandle,
 			break;
 			case "txt":
 				txt = newValue;
+				txt = txt.replaceAll("'", "&apos;");
 			break;
 		}
 

diff --git a/Source/src/main/webapp/WEB-INF/ajaxViews/groupFieldEdit.jsp b/Source/src/main/webapp/WEB-INF/ajaxViews/groupFieldEdit.jsp
@@ -17,6 +17,27 @@
 		<c:if test="${newTxtHeight lt 3}">
 			<c:set var="newTxtHeight" value="3" />
 		</c:if>
+		<script src="${baseURI}/scripts/tinymce/tinymce.min.js"></script>
+		<script type="text/javascript">
+			$("#editSave").css("display","none");
+			
+			tinymce.init({		
+			    selector: "textarea",
+			    menubar : false,
+			    content_css : "${baseURI}/styles/tinymce.css",
+			    oninit : "setPlainText",
+			    browser_spellcheck : true,
+			    plugins: "paste save link code",
+			    target_list: [{title: 'None', value: ''}],
+			    paste_as_text: true,
+			    toolbar: "save | undo redo | link | bullist | italic | code | git",
+			    valid_elements :"a[href|target=_blank],strong/b,em,div,br,p,li,ul",
+			    save_onsavecallback: function(){
+			    	$("textarea [name=newText]").html(this.getContent());
+					$("#editSave").click();
+			    }
+			});
+		</script>
 		<textarea name="newValue" style="height:${newTxtHeight}em">${curVal}</textarea>
 		<c:if test="${not empty editDoc}">
 			<p class="editDoc">${editDoc}</p>