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

Remvoing getEditConfigObject() from EditConfigurationTemplateModel

Browse source
This commit is contained in:
briancaruso 2011-11-17 19:28:11 +00:00
parent 450b3b8206
commit cbc53bd701
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
View file

@ -27,6 +27,8 @@ 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.controller.freemarker.UrlBuilder;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
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;
@ -46,12 +48,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
this.vreq = vreq;
//get additional data that may be required to generate template
this.retrieveEditData();
}
//Seeing if returning edit config object might work
public EditConfigurationVTwo getEditConfigObject() {
return editConfig;
}
}
public String getEditKey(){
return editConfig.getEditKey();
@ -542,10 +539,17 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
//Additional methods that were originally in edit request dispatch controller
//to be employed here instead
public String getUrlToReturnTo() {
return vreq
.getParameter("urlPattern") == null ? "/entity" : vreq
.getParameter("urlPattern");
public String getUrlToReturnTo() {
if( editConfig.getEntityToReturnTo() != null &&
! editConfig.getEntityToReturnTo().trim().isEmpty()) {
ParamMap params = new ParamMap();
params.put("uri", editConfig.getEntityToReturnTo());
return UrlBuilder.getUrl(UrlBuilder.Route.INDIVIDUAL, params);
}else if( vreq.getParameter("urlPattern") != null ){
return vreq.getParameter("urlPattern");
}else{
return UrlBuilder.Route.INDIVIDUAL.path();
}
}
public String getCurrentUrl() {