diff --git a/productMods/edit/forms/addAuthorsToInformationResource.jsp b/productMods/edit/forms/addAuthorsToInformationResource.jsp
index 1c3734f2..ba4f1a5c 100644
--- a/productMods/edit/forms/addAuthorsToInformationResource.jsp
+++ b/productMods/edit/forms/addAuthorsToInformationResource.jsp
@@ -290,6 +290,8 @@ SPARQL queries for existing values. --%>
+
This form is unable to handle the editing of this position because it is associated with
diff --git a/productMods/edit/forms/addPublicationToPerson.jsp b/productMods/edit/forms/addPublicationToPerson.jsp
index 3ab257c3..2dae767e 100644
--- a/productMods/edit/forms/addPublicationToPerson.jsp
+++ b/productMods/edit/forms/addPublicationToPerson.jsp
@@ -296,6 +296,8 @@ SPARQL queries for existing values. --%>
+
JSP form, must be removed for the 1.4!
+
<% if( mode == EditMode.ERROR ){ %>
This form is unable to handle the editing of this position because it is associated with
multiple Position individuals.
@@ -347,4 +349,4 @@ var customFormData = {
<% } %>
-
\ No newline at end of file
+
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 0e4a8595..8a982512 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -500,6 +500,8 @@ log.debug("TYPE QUERY: " + vreq.getAttribute("typeQuery"));
+
JSP form, must be removed for the 1.4!
+
<% if( mode == EditMode.ERROR ){ %>
This form is unable to handle the editing of this role because it is associated with
multiple ${param.roleDescriptor} individuals.
@@ -668,4 +670,4 @@ private String getActivityTypeQuery(VitroRequest vreq) {
return activityTypeQuery;
}
-%>
\ No newline at end of file
+%>
diff --git a/productMods/edit/forms/manageWebpagesForIndividual.jsp b/productMods/edit/forms/manageWebpagesForIndividual.jsp
index 6a2f534f..ae39c5af 100644
--- a/productMods/edit/forms/manageWebpagesForIndividual.jsp
+++ b/productMods/edit/forms/manageWebpagesForIndividual.jsp
@@ -109,6 +109,8 @@
+
JSP form, must be removed for the 1.4!
+
<%= subjectName %>
Manage Web Pages
diff --git a/productMods/edit/forms/newIndividualForm.jsp b/productMods/edit/forms/newIndividualForm.jsp
index 25797273..ddc61220 100644
--- a/productMods/edit/forms/newIndividualForm.jsp
+++ b/productMods/edit/forms/newIndividualForm.jsp
@@ -173,6 +173,8 @@ parameter set up by editRequestDispatch.
+
JSP form, must be removed for the 1.4!
+
Create a new ${typeName}
" >
diff --git a/productMods/edit/forms/organizationHasPositionHistory.jsp b/productMods/edit/forms/organizationHasPositionHistory.jsp
index 293196e1..a4a93a54 100644
--- a/productMods/edit/forms/organizationHasPositionHistory.jsp
+++ b/productMods/edit/forms/organizationHasPositionHistory.jsp
@@ -320,6 +320,8 @@
+
JSP form, must be removed for the 1.4!
+
${title}
" >
diff --git a/productMods/edit/forms/personHasEducationalTraining.jsp b/productMods/edit/forms/personHasEducationalTraining.jsp
index 702e1818..1951504d 100644
--- a/productMods/edit/forms/personHasEducationalTraining.jsp
+++ b/productMods/edit/forms/personHasEducationalTraining.jsp
@@ -506,6 +506,7 @@ This goes to an experimental FM based form:
+
JSP form, must be removed for the 1.4!
<% if( mode == EditMode.ERROR ){ %>
This form is unable to handle the editing of this position because it is associated with
diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp
index 3765d2f7..cab18dc5 100644
--- a/productMods/edit/forms/personHasPositionHistory.jsp
+++ b/productMods/edit/forms/personHasPositionHistory.jsp
@@ -422,6 +422,8 @@ type is returned and we don't get a match to the select element options. --%>
+
JSP form, must be removed for the 1.4!
+
<% if( mode == EditMode.ERROR ){ %>
This form is unable to handle the editing of this position because it is associated with
multiple Position individuals.
diff --git a/productMods/edit/forms/terminologyAnnotation.jsp b/productMods/edit/forms/terminologyAnnotation.jsp
index 57146759..8458898d 100644
--- a/productMods/edit/forms/terminologyAnnotation.jsp
+++ b/productMods/edit/forms/terminologyAnnotation.jsp
@@ -192,6 +192,8 @@ SPARQL queries for existing values. --%>
+
JSP form, must be removed for the 1.4!
+
<%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE ON THIS PAGE WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%>
${title}
diff --git a/productMods/edit/forms/unsupportedBrowserMessage.jsp b/productMods/edit/forms/unsupportedBrowserMessage.jsp
index fd63e787..fb3b38dd 100644
--- a/productMods/edit/forms/unsupportedBrowserMessage.jsp
+++ b/productMods/edit/forms/unsupportedBrowserMessage.jsp
@@ -7,9 +7,10 @@
+
JSP form, must be removed for the 1.4!
This form is not supported in versions of Internet Explorer below version 8. Please upgrade your browser, or
switch to another browser, such as FireFox.
-
\ No newline at end of file
+
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
index 2e44f5b3..1593f3cd 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
@@ -64,6 +64,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.FieldVTwo;
*/
public class PersonHasEducationalTraining extends VivoBaseGenerator implements EditConfigurationGenerator{
+ //TODO: can we get rid of the session and get it form the vreq?
public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
EditConfigurationVTwo conf = new EditConfigurationVTwo();
@@ -77,7 +78,7 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
conf.setVarNameForSubject("person");
conf.setVarNameForPredicate("predicate");
conf.setVarNameForObject("edTraining");
-
+
conf.setN3Required( Arrays.asList( n3ForNewEdTraining, orgLabelAssertion, orgTypeAssertion ) );
conf.setN3Optional(Arrays.asList(
n3ForEdTrainingToOrg, majorFieldAssertion, degreeAssertion,
@@ -90,7 +91,7 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
conf.addNewResource("startNode",DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("endNode",DEFAULT_NS_FOR_NEW_RESOURCE);
- //uris in scope: none
+ //uris in scope: none
//literals in scope: none
conf.setUrisOnform( Arrays.asList( "org", "orgType", "degree"));