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

NIHVIVO-3757 now using ChildVClassesOptions to get the organization types; AddPresenter role now using ChildVClassesWithParent

Browse source
This commit is contained in:
tworrall 2012-05-10 19:01:49 +00:00
parent 61e280d104
commit 8b3e420dd7
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,12 +4,12 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaClassGroupOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
public class AddMemberRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
private static String template = "addMemberRoleToPerson.ftl";
private static String VCLASS_GROUP_URI = "http://vivoweb.org/ontology#vitroClassGrouporganizations";
private static String VCLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
@Override
String getTemplate() {
return template;
@ -22,7 +22,7 @@ public class AddMemberRoleToPersonGenerator extends AddRoleToPersonTwoStageGener
@Override
FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
return new IndividualsViaClassGroupOptions(VCLASS_GROUP_URI)
return new ChildVClassesOptions(VCLASS_URI)
.setDefaultOptionLabel( "Select one");
}

3
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
View file

@ -15,6 +15,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalVali
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
@ -113,7 +114,7 @@ public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator impleme
conf.addField( new FieldVTwo().
setName("presentationType").
setValidators( list("nonempty") ).
setOptions( new ChildVClassesOptions(
setOptions( new ChildVClassesWithParent(
presentationClass))
);