From 2ba253afb7eea57ec1ef5fc17c17710e92c35820 Mon Sep 17 00:00:00 2001 From: hudajkhan Date: Mon, 11 Nov 2013 18:42:31 -0500 Subject: [PATCH] skos relates should show just concepts and not subclasses for select existing or add new --- rdf/tbox/firsttime/initialTBoxAnnotations.n3 | 2 ++ .../generators/AddEditWebpageFormGenerator.java | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 32f22456..c56dac9f 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -5088,6 +5088,8 @@ vivo:termLabel skos:related rdfs:label "related"@en-US ; + vitro:customEntryFormAnnot + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddConceptThroughObjectPropertyGenerator"^^xsd:string ; vitro:displayLimitAnnot "5"^^xsd:int ; vitro:displayRankAnnot 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 4a742623..376c7002 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 @@ -240,11 +240,22 @@ public class AddEditWebpageFormGenerator extends BaseEditConfigurationGenerator private String getUrlPatternToReturnTo(VitroRequest vreq) { String subjectUri = EditConfigurationUtils.getSubjectUri(vreq); String predicateUri = EditConfigurationUtils.getPredicateUri(vreq); + //Also add domain and range uris if they exist to enable cancel to work properly + String domainUri = (String) vreq.getParameter("domainUri"); + String rangeUri = (String) vreq.getParameter("rangeUri"); String generatorName = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"; String editUrl = EditConfigurationUtils.getEditUrlWithoutContext(vreq); - return editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) + + String returnPath = editUrl + "?subjectUri=" + UrlBuilder.urlEncode(subjectUri) + "&predicateUri=" + UrlBuilder.urlEncode(predicateUri) + "&editForm=" + UrlBuilder.urlEncode(generatorName); + if(domainUri != null && !domainUri.isEmpty()) { + returnPath += "&domainUri=" + UrlBuilder.urlEncode(domainUri); + } + if(rangeUri != null && !rangeUri.isEmpty()) { + returnPath += "&rangeUri=" + UrlBuilder.urlEncode(rangeUri); + } + return returnPath; + } private String getLinkUri(VitroRequest vreq) {