diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index 02a4cbe3..06e13db8 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -151,6 +151,16 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. <%= (mode == 1 || mode == 3) ?"\"nonempty\"," : "" %> <%= (mode == 1 || mode == 3) ?"\"nonempty\"" : "" %> +<%-- + + + + + + + + +--%> ${vivoCore}year @@ -166,11 +176,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. ?role <${endYearPredicate}> ?endYear . - - - ?role <${descriptionPredicate}> ?roleDescription . - - ?role <${label}> ?roleLabel . @@ -218,10 +223,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. SELECT ?existingStartYear WHERE { ?role <${endYearPredicate}> ?existingStartYear .} - - SELECT ?description WHERE { ?role <${descriptionPredicate}> ?description . } - - PREFIX core: <${vivoCore}> SELECT ?existingActivity WHERE { ?role core:roleIn ?existingActivity . } @@ -250,25 +251,19 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. "object" : ["role", "${objectUriJson}", "URI" ], "n3required" : [ "${n3ForNewRole}", "${startYearAssertion}", "${roleLabelAssertion}" ], - "n3optional" : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${endYearAssertion}", "${descriptionAssertion}" ], - + "n3optional" : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${endYearAssertion}" ], + "newResources" : { "role" : "${defaultNamespace}", "roleActivity" : "${defaultNamespace}" }, "urisInScope" : { "inverseRolePredicate" : "${inversePredicate}" }, "literalsInScope": { }, "urisOnForm" : [ "roleActivity", "roleActivityType" ], - "literalsOnForm" : [ "activityLabel", "roleLabel", "startYear", "endYear", "roleDescription" ], + "literalsOnForm" : [ "activityLabel", "roleLabel", "startYear", "endYear" ], "filesOnForm" : [ ], "sparqlForLiterals" : { }, "sparqlForUris" : { }, - "sparqlForExistingLiterals" : { - "activityLabel" : "${activityLabelQuery}", - "roleLabel" : "${roleLabelQuery}", - "startYear" : "${startYearQuery}", - "endYear" : "${endYearQuery}", - "roleDescription" : "${descriptionQuery}" - }, + "sparqlForExistingLiterals" : { "activityLabel":"${activityLabelQuery}", "roleLabel":"${roleLabelQuery}", "startYear":"${startYearQuery}", "endYear":"${endYearQuery}" }, "sparqlForExistingUris" : { "roleActivity":"${activityQuery}" , "roleActivityType":"${activityTypeQuery}" }, "fields" : { "activityLabel" : { @@ -336,17 +331,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. "rangeDatatypeUri" : "${gYearDatatypeUriJson}", "rangeLang" : "", "assertions" : ["${endYearAssertion}"] - }, - "roleDescription" : { - "newResource" : "false", - "validators" : [ ], - "optionsType" : "UNDEFINED", - "literalOptions" : [ ], - "predicateUri" : "", - "objectClassUri" : "", - "rangeDatatypeUri" : "", - "rangeLang" : "", - "assertions" : ["${descriptionAssertion}"] } } } @@ -437,7 +421,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.

- diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp index 5568cba9..df4e1040 100644 --- a/productMods/templates/entity/roleShortView.jsp +++ b/productMods/templates/entity/roleShortView.jsp @@ -29,9 +29,7 @@ Optional vars: <%-- individual is the OBJECT of the property referenced -- the Role individual, not the Person or grant --%> - - - + <%-- get years off role --%> @@ -112,8 +110,6 @@ Optional vars: - - <%-- only show error messages if logged in --%> @@ -124,14 +120,12 @@ Optional vars: ">${name} ${label} ${startYear}${endYearVal} ${errorMsg} - -
${description} -
${name} ${label} ${errorMsg} -
+
+