From a3fec9f3d20c5e6c6de8280a5ed903e352d41265 Mon Sep 17 00:00:00 2001 From: tworrall Date: Fri, 15 Feb 2013 10:00:56 -0500 Subject: [PATCH] after adding a web site, the user will now be taken back to the manage web site page instead of the individual profile page --- .../generators/AddEditWebpageFormGenerator.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java index 367342b5..b63fcc7d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java @@ -17,6 +17,7 @@ import com.hp.hpl.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; @@ -49,6 +50,8 @@ public class AddEditWebpageFormGenerator extends BaseEditConfigurationGenerator @Override public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception { EditConfigurationVTwo config = setupConfig(vreq, session); + + config.setUrlPatternToReturnTo(getUrlPatternToReturnTo(vreq)); prepare(vreq, config); return config; } @@ -227,4 +230,15 @@ public class AddEditWebpageFormGenerator extends BaseEditConfigurationGenerator return N3_FOR_WEBPAGE; } + private String getUrlPatternToReturnTo(VitroRequest vreq) { + String subjectUri = EditConfigurationUtils.getSubjectUri(vreq); + String predicateUri = EditConfigurationUtils.getPredicateUri(vreq); + String generatorName = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"; + String editUrl = EditConfigurationUtils.getEditUrlWithoutContext(vreq); + return editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) + + "&predicateUri=" + UrlBuilder.urlEncode(predicateUri) + + "&editForm=" + UrlBuilder.urlEncode(generatorName); + } + + }