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

Merging from 1.5 maint branch

Browse source 
removing unnecessary option list building from several custom forms NIHVIVO-3899
This commit is contained in:
briancaruso 2012-07-11 15:16:18 +00:00
parent 1336709d4f
commit 5e79cca398
5 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java
View file

@ -218,9 +218,8 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
.setRangeDatatypeUri(XSD.xstring.toString())
.setValidators(list("nonempty")));
conf.addField(new FieldVTwo().setName("existingPerson")
.setOptions(
new IndividualsViaVClassOptions(personClass)));
//options for existingPerson will be added in browser by auto complete JS
conf.addField(new FieldVTwo().setName("existingPerson"));
conf.addField(new FieldVTwo().setName("personLabel")
.setRangeDatatypeUri(XSD.xstring.toString())

6
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisingRelationshipGenerator.java
View file

@ -144,10 +144,8 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
new IndividualsViaVClassOptions(degreeClass))
);
conf.addField( new FieldVTwo().
setName("existingAdvisee").
setOptions(
new IndividualsViaVClassOptions(adviseeClass))
conf.addField( new FieldVTwo(). //options set by auto complete JS
setName("existingAdvisee")
);
conf.addField( new FieldVTwo().

6
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
View file

@ -109,10 +109,8 @@ public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements
setValidators( list("datatype:" + XSD.xstring.toString()) )
);
conf.addField( new FieldVTwo().
setName("existingOrg").
setOptions( new IndividualsViaVClassOptions(
orgClass))
conf.addField( new FieldVTwo().//options will be added in browser by auto complete JS
setName("existingOrg")
);
conf.addField( new FieldVTwo().

6
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
View file

@ -136,9 +136,9 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
setValidators(list("datatype:" + XSD.xstring.toString())));
conf.addField( new FieldVTwo().
setName("existingOrg").
setOptions( new IndividualsViaVClassOptions(
orgClass)));
setName("existingOrg")
//options will be added in browser by auto complete JS
);
conf.addField( new FieldVTwo().
setName("orgLabel").

6
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
View file

@ -120,11 +120,9 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme
setOptions(
new ChildVClassesWithParent(positionClass)));
conf.addField( new FieldVTwo().
setName("existingOrg").
setOptions(
new IndividualsViaVClassOptions(
orgClass)));
setName("existingOrg")); //options set in browser by auto complete JS
conf.addField( new FieldVTwo().
setName("orgLabel").