Skip to content

Commit 1bcd399

Browse files
litvinovgchenejac
authored andcommitted
Provide faux property context uri for authorization checks on add/edit of webpage faux property statements.
1 parent 0226925 commit 1bcd399

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import javax.servlet.http.HttpSession;
55

6+
import org.apache.commons.lang3.StringUtils;
67
import org.apache.commons.logging.Log;
78
import org.apache.commons.logging.LogFactory;
89

@@ -60,6 +61,7 @@ protected EditConfigurationVTwo setupConfig(VitroRequest vreq, HttpSession sessi
6061

6162
config.setVarNameForSubject("subject");
6263
config.setVarNameForObject("vcard");
64+
config.addFormSpecificData("fauxContextUri", vreq.getParameter("fauxContextUri"));
6365

6466
config.addNewResource("vcard", DEFAULT_NS_FOR_NEW_RESOURCE);
6567
config.addNewResource("link", DEFAULT_NS_FOR_NEW_RESOURCE);
@@ -238,6 +240,7 @@ private String getUrlPatternToReturnTo(VitroRequest vreq) {
238240
String rangeUri = (String) vreq.getParameter("rangeUri");
239241
String generatorName = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator";
240242
String editUrl = EditConfigurationUtils.getEditUrlWithoutContext(vreq);
243+
String fauxContextUri = vreq.getParameter("fauxContextUri");
241244
String returnPath = editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) +
242245
"&predicateUri=" + UrlBuilder.urlEncode(predicateUri) +
243246
"&editForm=" + UrlBuilder.urlEncode(generatorName);
@@ -247,6 +250,9 @@ private String getUrlPatternToReturnTo(VitroRequest vreq) {
247250
if(rangeUri != null && !rangeUri.isEmpty()) {
248251
returnPath += "&rangeUri=" + UrlBuilder.urlEncode(rangeUri);
249252
}
253+
if (StringUtils.isNotBlank(fauxContextUri)) {
254+
returnPath += "&fauxContextUri=" + UrlBuilder.urlEncode(fauxContextUri);
255+
}
250256
return returnPath;
251257

252258
}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java

+6
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
* This mainly sets up pageData for the template to use.
3939
*/
4040
public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
41+
private static final String OBO_HAS_CONTACT_INFO_URI = "http://purl.obolibrary.org/obo/ARG_2000028";
42+
4143
public static Log log = LogFactory.getLog(ManageWebpagesForIndividualGenerator.class);
4244

4345
@Override
@@ -59,10 +61,12 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
5961
config.addFormSpecificData("rankPredicate", "http://vivoweb.org/ontology/core#rank" );
6062
config.addFormSpecificData("reorderUrl", "/edit/reorder" );
6163
config.addFormSpecificData("deleteWebpageUrl", "/edit/primitiveDelete");
64+
String fauxContextUri = vreq.getParameter("fauxContextUri");
6265

6366
ParamMap paramMap = new ParamMap();
6467
paramMap.put("subjectUri", config.getSubjectUri());
6568
paramMap.put("editForm", this.getEditForm());
69+
paramMap.put("fauxContextUri", fauxContextUri);
6670
paramMap.put("view", "form");
6771
String path = UrlBuilder.getUrl( UrlBuilder.Route.EDIT_REQUEST_DISPATCH ,paramMap);
6872

@@ -76,6 +80,8 @@ public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession
7680
paramMap.put("predicateUri", config.getPredicateUri());
7781
paramMap.put("editForm" , this.getEditForm() );
7882
paramMap.put("cancelTo", "manage");
83+
paramMap.put("fauxContextUri", fauxContextUri);
84+
7985
if(domainUri != null && !domainUri.isEmpty()) {
8086
paramMap.put("domainUri", domainUri);
8187
}

webapp/src/main/webapp/templates/freemarker/edit/forms/addEditWebpageForm.ftl

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<form class="customForm" action ="${submitUrl}">
5151
<input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}">
5252
<input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}">
53+
<input type="hidden" name="fauxContextUri" value="${editConfiguration.pageData.fauxContextUri!}">
5354

5455
<label for="urlType">${i18n().url_type}${requiredHint}</label>
5556
<#assign urlTypeOpts = editConfiguration.pageData.urlType />

0 commit comments

Comments
 (0)