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

Browse source
This commit is contained in:
hjkhjk54 2011-11-04 14:19:04 +00:00
parent 926fb51ff7
commit 8a54ca774e
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
View file

@ -127,15 +127,10 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/cust
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customFormWithAutocomplete.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}
<#--
Scripts based on jsp also include browserUtils
${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/customFormWithAutocomplete.js"></script>')}
-->
</#if>

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

@ -861,9 +861,9 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
String predicate = EditConfigurationUtils.getPredicateUri(vreq);
String query = "PREFIX core:<" + getVivoCoreNamespace() + "> \n" +
"SELECT ?grantUri WHERE { \n" +
"<" + subject + "> <" + predicate + "> ?grantRole .\n" +
String query = "PREFIX core:<" + getVivoCoreNamespace() + "> " +
"SELECT ?grantUri WHERE { " +
"<" + subject + "> <" + predicate + "> ?grantRole ." +
"?grantRole <" + getRoleToGrantPredicate(vreq) + "> ?grantUri . }";
return query;
}

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

@ -34,6 +34,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.FoafNameToRdfsLabelPreprocessor;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.processEdit.RdfLiteralHash;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditN3GeneratorVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.SelectListGeneratorVTwo;
@ -95,6 +96,9 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
//set fields
setFields(editConfiguration, vreq, EditConfigurationUtils.getPredicateUri(vreq));
//Add preproprocessors
// No need to put in session here b/c put in session within edit request dispatch controller instead
//placing in session depends on having edit key which is handled in edit request dispatch controller
// editConfiguration.putConfigInSession(editConfiguration, session);
@ -112,12 +116,22 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
setEditKey(editConfiguration, vreq);
addFormSpecificData(editConfiguration, vreq);
addPreprocessors(editConfiguration, vreq.getWebappDaoFactory());
return editConfiguration;
}
private Map<String, String> generateNewResources(VitroRequest vreq) {
private void addPreprocessors(EditConfigurationVTwo editConfiguration,
WebappDaoFactory webappDaoFactory) {
editConfiguration.addModelChangePreprocessor(new FoafNameToRdfsLabelPreprocessor());
}
private Map<String, String> generateNewResources(VitroRequest vreq) {
HashMap<String, String> newResources = new HashMap<String, String>();
//TODO: Get default namespace
String defaultNamespace = vreq.getWebappDaoFactory().getDefaultNamespace();
@ -275,6 +289,7 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
getLabelField(editConfiguration, vreq, fields);
getFirstNameField(editConfiguration, vreq, fields);
getLastNameField(editConfiguration, vreq, fields);
editConfiguration.setFields(fields);
}
private void getLastNameField(EditConfigurationVTwo editConfiguration,