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

NIHVIVO-799 Revert change that shows full view of two-step form when a type is selected on page load: doesn't work for roles forms because there's no empty value.

Browse source
This commit is contained in:
rjy7 2010-07-14 18:09:29 +00:00
parent d131d6e996
commit 87bdc3aa36
6 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/edit/forms/addClinicalRoleToPerson.jsp
View file

@ -6,5 +6,5 @@
<jsp:param name="roleActivityType_optionsType" value="LITERALS" /> <jsp:param name="roleActivityType_optionsType" value="LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" /> <jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' /> <jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
</jsp:include> </jsp:include>

2
productMods/edit/forms/addMemberRoleToPerson.jsp
View file

@ -6,5 +6,5 @@
<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" /> <jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
<jsp:param name="roleActivityType_objectClassUri" value="http://xmlns.com/foaf/0.1/Organization" /> <jsp:param name="roleActivityType_objectClassUri" value="http://xmlns.com/foaf/0.1/Organization" />
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" /> <jsp:param name="roleActivityType_literalOptions" value="[ '', 'Select one' ]" />
</jsp:include> </jsp:include>

2
productMods/edit/forms/addPresenterRoleToPerson.jsp
View file

@ -7,5 +7,5 @@
<jsp:param name="roleActivityType_optionsType" value="LITERALS" /> <jsp:param name="roleActivityType_optionsType" value="LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" /> <jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' /> <jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
</jsp:include> </jsp:include>

2
productMods/edit/forms/addResearcherRoleToPerson.jsp
View file

@ -6,5 +6,5 @@
<jsp:param name="roleActivityType_optionsType" value="LITERALS" /> <jsp:param name="roleActivityType_optionsType" value="LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" /> <jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' /> <jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
</jsp:include> </jsp:include>

2
productMods/edit/forms/addTeacherRoleToPerson.jsp
View file

@ -6,5 +6,5 @@
<jsp:param name="roleActivityType_optionsType" value="LITERALS" /> <jsp:param name="roleActivityType_optionsType" value="LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" /> <jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' /> <jsp:param name="roleActivityType_literalOptions" value='["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
</jsp:include> </jsp:include>

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

@ -78,11 +78,14 @@ var customForm = {
// If type is already selected when the page loads (Firefox retains value // If type is already selected when the page loads (Firefox retains value
// on a refresh), go directly to full view. Otherwise user has to reselect // on a refresh), go directly to full view. Otherwise user has to reselect
// twice to get to full view. // twice to get to full view.
else if (typeVal.length) { // RY Can't do this now: role forms don't have an empy option at the top (and can't at the
this.acType = typeVal; // moment, since there's no way to specify literal options without having them sorted).
this.setLabelFieldLabel(); // So when the page loads there's already a value selected.
this.initFormFullView(); // else if (typeVal.length) {
} // this.acType = typeVal;
// this.setLabelFieldLabel();
// this.initFormFullView();
// }
else { else {
this.initFormTypeView(); this.initFormTypeView();
} }