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

Merge r1120 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-23 20:48:30 +00:00
parent f47c886d27
commit 2db6b67186
2 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
productMods/edit/forms/addRoleToPersonTwoStage.jsp
View file

@ -298,17 +298,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
"rangeLang" : "", "rangeLang" : "",
"assertions" : [ "${n3ForRoleToActivity}" ] "assertions" : [ "${n3ForRoleToActivity}" ]
}, },
"existingActivityLabel" : { /* Needed iff we return from an invalid submission */
"newResource" : "false",
"validators" : [ ],
"optionsType" : "UNDEFINED",
"literalOptions" : [ ],
"predicateUri" : "",
"objectClassUri" : "",
"rangeDatatypeUri" : "",
"rangeLang" : "",
"assertions" : [ ]
},
"roleLabel" : { "roleLabel" : {
"newResource" : "false", "newResource" : "false",
"validators" : [ "nonempty","datatype:${stringDatatypeUriJson}" ], "validators" : [ "nonempty","datatype:${stringDatatypeUriJson}" ],
@ -417,7 +406,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<%-- RY maybe make this a label and input field. See what looks best. --%> <%-- RY maybe make this a label and input field. See what looks best. --%>
<p class="inline"><label></label><span class="acSelectionInfo"></span> <a href="<c:url value="/individual?uri=" />" class="verifyMatch">(Verify this match)</a></p> <p class="inline"><label></label><span class="acSelectionInfo"></span> <a href="<c:url value="/individual?uri=" />" class="verifyMatch">(Verify this match)</a></p>
<v:input type="hidden" id="roleActivityURI" name="roleActivity" cssClass="acUriReceiver" /> <!-- Field value populated by JavaScript --> <v:input type="hidden" id="roleActivityURI" name="roleActivity" cssClass="acUriReceiver" /> <!-- Field value populated by JavaScript -->
<v:input type="hidden" id="existingActivityLabel" name="existingActivityLabel" cssClass="acLabelReceiver" /> <%-- Needed iff we return from an invalid submission --%>
</div> </div>
<p><v:input type="text" id="newIndLabel" name="roleLabel" label="Role in ### ${requiredHint}" size="50" /></p> <p><v:input type="text" id="newIndLabel" name="roleLabel" label="Role in ### ${requiredHint}" size="50" /></p>

11
productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
View file

@ -53,7 +53,7 @@ var customForm = {
this.acSelection = this.form.find('.acSelection'); this.acSelection = this.form.find('.acSelection');
this.acSelectionInfo = this.form.find('.acSelectionInfo'); this.acSelectionInfo = this.form.find('.acSelectionInfo');
this.acUriReceiver = this.form.find('.acUriReceiver'); this.acUriReceiver = this.form.find('.acUriReceiver');
this.acLabelReceiver = this.form.find('.acLabelReceiver'); //this.acLabelReceiver = this.form.find('.acLabelReceiver');
this.verifyMatch = this.form.find('.verifyMatch'); this.verifyMatch = this.form.find('.verifyMatch');
this.verifyMatchBaseHref = this.verifyMatch.attr('href'); this.verifyMatchBaseHref = this.verifyMatch.attr('href');
this.acSelectorWrapper = this.acSelector.parent(); this.acSelectorWrapper = this.acSelector.parent();
@ -161,7 +161,7 @@ var customForm = {
initFormWithValidationErrors: function() { initFormWithValidationErrors: function() {
var uri = this.acUriReceiver.val(), var uri = this.acUriReceiver.val(),
label = this.acLabelReceiver.val(); label = this.acSelector.val();
// Call initFormFullView first, because showAutocompleteSelection needs // Call initFormFullView first, because showAutocompleteSelection needs
// acType, which is set in initFormFullView. // acType, which is set in initFormFullView.
@ -324,7 +324,7 @@ var customForm = {
showAutocompleteSelection: function(label, uri) { showAutocompleteSelection: function(label, uri) {
this.acSelectorWrapper.hide(); this.acSelectorWrapper.hide();
this.acSelector.attr('disabled', 'disabled'); //this.acSelector.attr('disabled', 'disabled');
// If only one form step, type is pre-selected, and the label is coded in the html. // If only one form step, type is pre-selected, and the label is coded in the html.
if (this.formSteps > 1) { if (this.formSteps > 1) {
@ -334,7 +334,6 @@ var customForm = {
this.acSelection.show(); this.acSelection.show();
this.acUriReceiver.val(uri); this.acUriReceiver.val(uri);
this.acLabelReceiver.val(label); // RY PROBABLY DON"T NEED THIS AT ALL????
this.acSelector.val(label); this.acSelector.val(label);
this.acSelectionInfo.html(label); this.acSelectionInfo.html(label);
this.verifyMatch.attr('href', this.verifyMatchBaseHref + uri); this.verifyMatch.attr('href', this.verifyMatchBaseHref + uri);
@ -354,11 +353,9 @@ var customForm = {
undoAutocompleteSelection: function() { undoAutocompleteSelection: function() {
this.acSelectorWrapper.show(); this.acSelectorWrapper.show();
this.acSelector.attr('disabled', '');
this.acSelector.val('');
this.hideFields(this.acSelection); this.hideFields(this.acSelection);
this.acSelector.val('');
this.acUriReceiver.val(''); this.acUriReceiver.val('');
this.acLabelReceiver.val('');
this.acSelectionInfo.html(''); this.acSelectionInfo.html('');
this.verifyMatch.attr('href', this.verifyMatchBaseHref); this.verifyMatch.attr('href', this.verifyMatchBaseHref);