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

updates to include "prepare" method from base edit configuration since old prepare has been removed from edit request dispatch controller - also commented out agrovoc from appearing on the search page

Browse source
This commit is contained in:
hjkhjk54 2011-12-01 21:11:04 +00:00
parent 556cd102f3
commit 4aee656ae6
12 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
View file

@ -129,7 +129,9 @@ public class AddAssociatedConceptGenerator extends VivoBaseGenerator implements
//Adding term should return to this same page, not the subject
//Return takes the page back to the individual form
editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils.getFormUrlWithoutContext(vreq));
return editConfiguration;
//prepare
prepare(vreq, editConfiguration);
return editConfiguration;
}

1
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
View file

@ -66,6 +66,7 @@ public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator
//Adding additional data, specifically edit mode
addFormSpecificData(editConfiguration, vreq);
prepare(vreq, editConfiguration);
return editConfiguration;
}

2
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java
View file

@ -92,7 +92,7 @@ public class AddEditWebpageFormGenerator extends BaseEditConfigurationGenerator
//might be null
config.addFormSpecificData("subjectName", getName( config, vreq));
prepare(vreq, config);
return config;
}

1
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java
View file

@ -92,6 +92,7 @@ public class AddPublicationToPersonGenerator extends VivoBaseGenerator implement
// Adding additional data, specifically edit mode
addFormSpecificData(editConfiguration, vreq);
prepare(vreq, editConfiguration);
return editConfiguration;
}

2
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java
View file

@ -168,6 +168,8 @@ public abstract class AddRoleToPersonTwoStageGenerator extends BaseEditConfigura
addPreprocessors(editConfiguration, vreq.getWebappDaoFactory());
//Adding additional data, specifically edit mode
addFormSpecificData(editConfiguration, vreq);
//prepare
prepare(vreq, editConfiguration);
return editConfiguration;
}

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

@ -119,7 +119,8 @@ public class AddUserDefinedConceptGenerator extends VivoBaseGenerator implement
//Adding term should return to this same page, not the subject
//Return takes the page back to the individual form
editConfiguration.setUrlPatternToReturnTo(getUrlPatternToReturnTo(vreq));
return editConfiguration;
prepare(vreq, editConfiguration);
return editConfiguration;
}

2
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
View file

@ -76,7 +76,7 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG
}else{
config.addFormSpecificData("subjectName", null);
}
prepare(vreq, config);
return config;
}

2
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
View file

@ -78,7 +78,7 @@ public class NewIndividualFormGenerator extends BaseEditConfigurationGenerator i
//Note, the spaces are important - they were added by ProcessRdfFormController earlier
//as a means of ensuring the substitution worked correctly - as the regex expects spaces
config.setEntityToReturnTo(" ?newInd ");
prepare(vreq, config);
return config;
}

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

@ -222,7 +222,7 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
conf.addValidator(new DateTimeIntervalValidationVTwo("startField",
"endField"));
prepare(vreq, conf);
return conf;
}
}

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

@ -179,6 +179,7 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
//Adding additional data, specifically edit mode
addFormSpecificData(conf, vreq);
prepare(vreq, conf);
return conf;
}

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

@ -158,7 +158,7 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme
//Adding additional data, specifically edit mode
addFormSpecificData(conf, vreq);
prepare(vreq, conf);
return conf;
}

5
src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
View file

@ -38,8 +38,9 @@ public class ConceptSearchServiceUtils {
public static HashMap<String, VocabSourceDescription> getVocabSources() {
HashMap<String, VocabSourceDescription> map = new HashMap<String, VocabSourceDescription>();
map.put(UMLSVocabSource, new VocabSourceDescription("UMLS", UMLSVocabSource, "http://www.nlm.nih.gov/research/umls/", "Unified Medical Language System"));
map.put(AgrovocVocabSource, new VocabSourceDescription("AGROVOC", AgrovocVocabSource, "http://www.fao.org/agrovoc/", "Agricultural Vocabulary"));
map.put(GemetVocabSource, new VocabSourceDescription("GEMET", GemetVocabSource, "http://www.eionet.europa.eu/gemet", "General Multilingual Environmental Thesaurus"));
//Commenting out agrovoc for now until implementation is updated
// map.put(AgrovocVocabSource, new VocabSourceDescription("AGROVOC", AgrovocVocabSource, "www.fao.org/agrovoc/", "Agricultural Vocabulary"));
map.put(GemetVocabSource, new VocabSourceDescription("GEMET", GemetVocabSource, "http://www.eionet.europa.eu/gemet", "GEneral Multilingual Environmental Thesaurus"));
return map;
}