diff --git a/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl b/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
index 034254b5..32824aaa 100644
--- a/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
+++ b/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
@@ -21,7 +21,7 @@
-
+
(Verify this match)
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
index 819d5bad..de7b8164 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java
@@ -235,6 +235,7 @@ public class AddUserDefinedConceptGenerator extends VivoBaseGenerator implement
List
literalsOnForm = new ArrayList();
//The URI of the node that defines the concept
urisOnForm.add("conceptNode");
+ editConfiguration.setUrisOnform(urisOnForm);
//In case the user defines a new concept, will add a concept label
literalsOnForm.add("conceptLabel");
editConfiguration.setLiteralsOnForm(literalsOnForm);
diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java b/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
index a81d50de..c0521e0b 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java
@@ -39,7 +39,7 @@ public class ConceptSearchServiceUtils {
HashMap map = new HashMap();
map.put(UMLSVocabSource, new VocabSourceDescription("UMLS", UMLSVocabSource, "http://www.nlm.nih.gov/research/umls/", "Unified Medical Language System"));
//Commenting out agrovoc for now until implementation is updated
- map.put(AgrovocVocabSource, new VocabSourceDescription("AGROVOC", AgrovocVocabSource, "http://www.fao.org/agrovoc/", "Agricultural Vocabulary"));
+ // map.put(AgrovocVocabSource, new VocabSourceDescription("AGROVOC", AgrovocVocabSource, "http://www.fao.org/agrovoc/", "Agricultural Vocabulary"));
map.put(GemetVocabSource, new VocabSourceDescription("GEMET", GemetVocabSource, "http://www.eionet.europa.eu/gemet", "GEneral Multilingual Environmental Thesaurus"));
return map;
}
diff --git a/src/edu/cornell/mannlib/vivo/auth/policy/VivoPolicy.java b/src/edu/cornell/mannlib/vivo/auth/policy/VivoPolicy.java
index 41875879..8779ff8c 100644
--- a/src/edu/cornell/mannlib/vivo/auth/policy/VivoPolicy.java
+++ b/src/edu/cornell/mannlib/vivo/auth/policy/VivoPolicy.java
@@ -29,6 +29,11 @@ public class VivoPolicy extends DefaultInconclusivePolicy{
private static final String AUTHORSHIP_TO_PUB = CORE + "linkedInformationResource";
private static final String INDIVIDUAL_TO_WEBPAGE = CORE + "webpage";
private static final String WEBPAGE_TO_INDIVIDUAL = CORE + "webpageOf";
+ private static final String HAS_RESEARCH_AREA = CORE + "hasResearchArea";
+ private static final String HAS_SUBJECT_AREA = CORE + "hasSubjectArea";
+ private static final String RESEARCH_AREA_OF = CORE + "researchAreaOf";
+ private static final String SUBJECT_AREA_OF = CORE + "subjectAreaOf";
+
@Override
public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
@@ -64,6 +69,14 @@ public class VivoPolicy extends DefaultInconclusivePolicy{
else if ( INDIVIDUAL_TO_WEBPAGE.equals( predicateUri ) || WEBPAGE_TO_INDIVIDUAL.equals( predicateUri )) {
return new BasicPolicyDecision(Authorization.UNAUTHORIZED,
"Use the custom edit form for core:webpage");
+ }
+ else if ( HAS_RESEARCH_AREA.equals( predicateUri ) || RESEARCH_AREA_OF.equals( predicateUri )) {
+ return new BasicPolicyDecision(Authorization.UNAUTHORIZED,
+ "Use the custom edit form for core:hasResearchArea");
+ }
+ else if ( HAS_SUBJECT_AREA.equals( predicateUri ) || SUBJECT_AREA_OF.equals( predicateUri )) {
+ return new BasicPolicyDecision(Authorization.UNAUTHORIZED,
+ "Use the custom edit form for core:hasSubjectArea");
}
}
else if( whatToAuth instanceof AddObjectPropStmt ){