From 4efe43c7e72e0dc6b130ce7397cb2c50cde135ac Mon Sep 17 00:00:00 2001
From: gneissone <mbgross@wustl.edu>
Date: Sat, 21 Mar 2020 18:56:49 -0600
Subject: [PATCH] Make data property richtext editor option selectable from UI

---
 .../controller/edit/DatapropEditController.java   | 12 +++++++-----
 .../controller/edit/DatapropRetryController.java  | 15 ++++++++++++++-
 .../webapp/dao/jena/DataPropertyDaoJena.java      |  2 ++
 .../templates/edit/specific/dataprop_retry.jsp    |  6 ++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
index a076d9aa5..26e71f4f0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
@@ -42,7 +42,7 @@ public class DatapropEditController extends BaseEditController {
 
     	VitroRequest vreq = new VitroRequest(request);
 
-        final int NUM_COLS=18;
+        final int NUM_COLS=19;
 
         String datapropURI = request.getParameter("uri");
 
@@ -73,8 +73,9 @@ public class DatapropEditController extends BaseEditController {
         results.add("display tier");          // column 14
         results.add("display limit");         // column 15
         results.add("custom entry form");     // column 16
-        results.add("URI");                   // column 17
-        results.add("publish level");         // column 18
+        results.add("editing");               // column 17
+        results.add("URI");                   // column 18
+        results.add("publish level");         // column 19
 
         results.add(dp.getPickListName()); // column 1
         results.add(dp.getPublicName() == null ? "(no public label)" : dp.getPublicName()); // column 2
@@ -142,9 +143,10 @@ public class DatapropEditController extends BaseEditController {
         results.add(String.valueOf(dp.getDisplayTier()));  // column 14
         results.add(String.valueOf(dp.getDisplayLimit()));  // column 15
         results.add(dp.getCustomEntryForm() == null ? "(unspecified)" : dp.getCustomEntryForm());  // column 16
-        results.add(dp.getURI() == null ? "" : dp.getURI()); // column 17
+        results.add(dp.getEditing() == null ? "" : dp.getEditing()); // column 17
+        results.add(dp.getURI() == null ? "" : dp.getURI()); // column 18
 		results.add(dp.getHiddenFromPublishBelowRoleLevel() == null ? "(unspecified)"
-				: dp.getHiddenFromPublishBelowRoleLevel().getDisplayLabel()); // column 18
+				: dp.getHiddenFromPublishBelowRoleLevel().getDisplayLabel()); // column 19
         request.setAttribute("results",results);
         request.setAttribute("columncount",NUM_COLS);
         request.setAttribute("suppressquery","true");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
index c8f3ced07..c4b04c08b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
@@ -168,13 +168,26 @@ public class DatapropRetryController extends BaseEditController {
         optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(objectForEditing));
         optionMap.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(objectForEditing));
 
+        // Set the value of the editing parameter (as defined in VitroVocabulary.java). 
+        // Use value to control form types as in defaultDataPropertyForm.ftl
+        String editingVal = objectForEditing.getEditing();
+        List<Option> editingOptList = new ArrayList<Option>();
+        editingOptList.add(0,new Option("","plaintext"));
+        editingOptList.add(1,new Option("HTML","rich text"));
+        for (Option val : editingOptList) {
+            if(editingVal != null && editingVal.equals(val.getValue())) {
+                val.setSelected(true);
+            }
+        }
+        optionMap.put("Editing", editingOptList);
+
         foo.setOptionLists(optionMap);
 
         request.setAttribute("functional",objectForEditing.getFunctional());
 
         //checkboxes are pretty annoying : we don't know if someone *unchecked* a box, so we have to default to false on updates.
         if (objectForEditing.getURI() != null) {
-        	objectForEditing.setFunctional(false);
+              objectForEditing.setFunctional(false);
         }
 
         foo.setErrorMap(epo.getErrMsgMap());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
index e7ca153dc..e45ec80ca 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
@@ -514,6 +514,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             addPropertyStringValue(jDataprop, EXAMPLE, dtp.getExample(), ontModel);
             addPropertyStringValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription(), ontModel);
             addPropertyStringValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription(), ontModel);
+            addPropertyStringValue(jDataprop, EDITING, dtp.getEditing(), ontModel);
             addPropertyNonNegativeIntValue(jDataprop, DISPLAY_RANK_ANNOT, dtp.getDisplayTier(), ontModel);
             addPropertyNonNegativeIntValue(jDataprop, DISPLAY_LIMIT, dtp.getDisplayLimit(), ontModel);
             //addPropertyStringValue(jDataprop, HIDDEN_ANNOT, dtp.getHidden(), ontModel);
@@ -584,6 +585,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             updatePropertyStringValue(jDataprop, EXAMPLE, dtp.getExample(), ontModel);
             updatePropertyStringValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription(), ontModel);
             updatePropertyStringValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription(), ontModel);
+            updatePropertyStringValue(jDataprop, EDITING, dtp.getEditing(), ontModel);
             updatePropertyNonNegativeIntValue(jDataprop, DISPLAY_RANK_ANNOT, dtp.getDisplayTier(), ontModel);
             updatePropertyNonNegativeIntValue(jDataprop, DISPLAY_LIMIT, dtp.getDisplayLimit(), ontModel);
 
diff --git a/webapp/src/main/webapp/templates/edit/specific/dataprop_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/dataprop_retry.jsp
index 1eac2ad80..0e5cda5bc 100644
--- a/webapp/src/main/webapp/templates/edit/specific/dataprop_retry.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/dataprop_retry.jsp
@@ -174,6 +174,12 @@
         </c:if>
     	</td>
 	</td>
+	<td valign="top" colspan="2">
+		<b>Rich text editing</b><br/>
+		<select name="Editing">
+		    <form:option name="Editing"/>
+		</select>
+	</td>
 </tr>
 <tr><td colspan="5"><hr class="formDivider"/></td></tr>