litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-646 Add cancelUrl parameter to submit tag in InputElementFormattingTags so that the cancel button can redirect to a different page from the form submission. Change cancel values in submit tags in vitro and vivo forms to "true" where previously they specified a uri, because the uri is misleading (it doesn't control the redirect location). Removed edit submission preprocessing due to problems with cloning.

Browse source
This commit is contained in:
rjy7 2010-06-17 14:27:03 +00:00
parent bd45d55237
commit 13c57446dd
6 changed files with 60 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
productMods/edit/forms/addAuthorsToInformationResource.jsp
View file

@ -125,13 +125,13 @@ SPARQL queries for existing values. --%>
?newPerson core:authorInAuthorship ?authorshipUri .
</v:jsonset>
<c:set var="returnPath" value="/edit/editRequestDispatch.jsp?subjectUri=${subjectUri}&predicateUri=${predicateUri}" />
<c:set var="returnPathAfterSubmit" value="/edit/editRequestDispatch.jsp?subjectUri=${subjectUri}&predicateUri=${predicateUri}" />
<c:set var="editjson" scope="request">
{
"formUrl" : "${formUrl}",
"editKey" : "${editKey}",
"urlPatternToReturnTo" : "${returnPath}",
"urlPatternToReturnTo" : "${returnPathAfterSubmit}",
"subject" : ["infoResource", "${subjectUriJson}" ],
"predicate" : ["predicate", "${predicateUriJson}" ],
@ -224,10 +224,11 @@ SPARQL queries for existing values. --%>
EditConfiguration.putConfigInSession(editConfig,session);
}
// Doing this in Javascript instead.
// For now the field names in CreateLabelFromFieldNames.processEditSubmission() are
// hard-coded. If we want the flexibility in naming them, we can pass in a map of
// hard-coded. If we want flexibility in naming them, we can pass in a map of
// the field names when creating the preprocessor.
editConfig.addEditSubmissionPreprocessor(new CreateLabelFromNameFields(editConfig));
// editConfig.addEditSubmissionPreprocessor(new CreateLabelFromNameFields(editConfig));
Model model = (Model) application.getAttribute("jenaOntModel");
String objectUri = (String) request.getAttribute("objectUri");
@ -295,7 +296,7 @@ SPARQL queries for existing values. --%>
</ul>
<div id="showAddForm">
<v:input type="submit" value="Add Author" id="showAddFormButton" cancel="${param.subjectUri}" cancelLabel="Return to Publication" />
<v:input type="submit" value="Add Author" id="showAddFormButton" cancel="true" cancelLabel="Return to Publication" cancelUrl="/individual" />
</div>
@ -304,11 +305,14 @@ SPARQL queries for existing values. --%>
<p class="inline"><v:input type="text" id="lastName" label="Last name ${requiredHint}" size="30" /></p>
<p class="inline"><v:input type="text" id="firstName" label="First name ${requiredHint}" size="20" />${initialHint}</p>
<p class="inline"><v:input type="text" id="middleName" label="Middle name" size="20" />${initialHint}</p>
<input type="hidden" name="personUri" value="" /> <!-- Field value populated by JavaScript -->
<input type="hidden" name="rank" value="${rank}" />
<p class="submit"><v:input type="submit" id="submit" value="Add Author" cancel="${param.subjectUri}" /></p>
<!-- Field values populated by JavaScript -->
<input type="hidden" id="label" name="label" value="" />
<input type="hidden" id="personUri" name="personUri" value="" />
<p class="submit"><v:input type="submit" id="submit" value="Add Author" cancel="true" /></p>
<p id="requiredLegend" class="requiredHint">* required fields</p>
</form>