diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java index bea9a6984..3b552782c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java @@ -73,12 +73,14 @@ public class DefaultDataPropertyFormGenerator extends BaseEditConfigurationGener editConfiguration.setVarNameForPredicate("predicate"); editConfiguration.setPredicateUri(predicateUri); + editConfiguration.setVarNameForObject( literalVar ); + editConfiguration.setLiteralsOnForm( Arrays.asList( literalVar )); editConfiguration.addField( new FieldVTwo() .setName( literalVar ) .setPredicateUri(predicateUri) - .setRangeDatatypeUri(rangeDatatypeUri)); + .setRangeDatatypeUri(rangeDatatypeUri)); //deal with empty field editConfiguration.addModelChangePreprocessor( new DefaultDataPropEmptyField() ); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java index b3c90b271..d773e78bb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java @@ -2,31 +2,16 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; -import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditSubmissionUtils; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.SelectListGeneratorVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.FieldVTwo; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditElementVTwo; - -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultObjectPropertyFormGenerator; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils; -import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode; -import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.text.Collator; +import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.LinkedHashMap; -import java.util.Map; import java.util.List; -import java.util.ArrayList; +import java.util.Map; import java.util.Set; import org.apache.commons.lang.StringUtils; @@ -35,11 +20,20 @@ import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.rdf.model.Literal; -import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; +import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; +import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.beans.Property; import edu.cornell.mannlib.vitro.webapp.beans.VClass; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditElementVTwo; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.FieldVTwo; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.SelectListGeneratorVTwo; +import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; public class EditConfigurationTemplateModel extends BaseTemplateModel { EditConfigurationVTwo editConfig; @@ -379,6 +373,10 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel { return dataLiteralName; } + public String getVarNameForObject() { + return editConfig.getVarNameForObject(); + } + //Get data property key //public description only appears visible for object property diff --git a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl index 147c7833e..afd183a44 100644 --- a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl @@ -11,7 +11,7 @@ <#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
- +