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

updates for replacing editRequestDispatch.jsp with editRequestDispatch

Browse source
This commit is contained in:
hjkhjk54 2011-11-30 18:40:39 +00:00
parent a990f44ffc
commit 697312b608
6 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
View file

@ -93,7 +93,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
if (PolicyHelper.isAuthorizedForActions(vreq, new EditIndividuals())) { if (PolicyHelper.isAuthorizedForActions(vreq, new EditIndividuals())) {
map.put("formAction", UrlBuilder.getUrl("/edit/editRequestDispatch.jsp")); map.put("formAction", UrlBuilder.getUrl("/editRequestDispatch.jsp"));
WebappDaoFactory wadf = vreq.getFullWebappDaoFactory(); WebappDaoFactory wadf = vreq.getFullWebappDaoFactory();

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

@ -435,6 +435,15 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
return statementDisplay; return statementDisplay;
} }
//Used for deletion in case there's a specific template to be employed
public String getDeleteTemplate() {
String templateName = vreq.getParameter("templateName");
if(templateName == null || templateName.isEmpty()) {
templateName = "propStatement-default.ftl";
}
return templateName;
}
//Retrieves data propkey from parameter and gets appropriate data value //Retrieves data propkey from parameter and gets appropriate data value
private String getDataLiteralValuesFromParameter() { private String getDataLiteralValuesFromParameter() {
String dataValue = null; String dataValue = null;

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
View file

@ -23,7 +23,7 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
private static final Log log = LogFactory.getLog(ObjectPropertyStatementTemplateModel.class); private static final Log log = LogFactory.getLog(ObjectPropertyStatementTemplateModel.class);
private static final String EDIT_PATH = "edit/editRequestDispatch.jsp"; private static final String EDIT_PATH = "editRequestDispatch";
private final Map<String, String> data; private final Map<String, String> data;

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
View file

@ -46,7 +46,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
private static final Log log = LogFactory.getLog(ObjectPropertyTemplateModel.class); private static final Log log = LogFactory.getLog(ObjectPropertyTemplateModel.class);
private static final String TYPE = "object"; private static final String TYPE = "object";
private static final String EDIT_PATH = "edit/editRequestDispatch.jsp"; private static final String EDIT_PATH = "editRequestDispatch";
private static final String IMAGE_UPLOAD_PATH = "/uploadImages"; private static final String IMAGE_UPLOAD_PATH = "/uploadImages";
private static final String END_DATE_TIME_VARIABLE = "dateTimeEnd"; private static final String END_DATE_TIME_VARIABLE = "dateTimeEnd";

2
webapp/web/templates/freemarker/edit/forms/autoCompleteObjpropForm.ftl
View file

@ -51,7 +51,7 @@ $(document).ready(function() {
<form id="autoCompleteDatapropForm" class="editForm" action="${submitUrl}" role="autocomplete"> <form id="autoCompleteDatapropForm" class="editForm" action="${submitUrl}" role="autocomplete">
<#if predicate.offerCreateNewOption > <#if predicate.offerCreateNewOption >
<#assign var="createNewUrl = "/edit/editRequestDispatch.jsp?subjectUri=${param.subjectUri}&predicateUri=${param.predicateUri}&clearEditConfig=true&cmd=create > <#assign var="createNewUrl = "/editRequestDispatch?subjectUri=${param.subjectUri}&predicateUri=${param.predicateUri}&clearEditConfig=true&cmd=create >
</#if> </#if>
<#if predicate.publicDescription?has_content > <#if predicate.publicDescription?has_content >

6
webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
View file

@ -6,15 +6,15 @@
<#assign toBeDeletedClass = "objProp" /> <#assign toBeDeletedClass = "objProp" />
</#if> </#if>
<#assign deletionTemplateName = editConfiguration.deleteTemplate/>
<#assign statement = editConfiguration.statementDisplay /> <#assign statement = editConfiguration.statementDisplay />
<form action="${editConfiguration.deleteProcessingUrl}" method="get"> <form action="${editConfiguration.deleteProcessingUrl}" method="get">
<h2>Are you sure you want to delete the following entry from <em>${editConfiguration.propertyName}</em>?</h2> <h2>Are you sure you want to delete the following entry from <em>${editConfiguration.propertyName}</em>?</h2>
<p class="toBeDeleted ${toBeDeletedClass}"> <p class="toBeDeleted ${toBeDeletedClass}">
<#if editConfiguration.objectProperty = true> <#if editConfiguration.objectProperty = true>
<#if statement.object?has_content> <#if statement?has_content>
<#include "propStatement-default.ftl" /> <#include deletionTemplateName />
</#if> </#if>
<#else> <#else>
${statement.dataValue} ${statement.dataValue}