Merge remote-tracking branch 'origin/develop' into develop

geonetwork · Jun 11, 2014 · 0b74f96 · 0b74f96
2 parents 393a803 + 0330f91
commit 0b74f96
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 6 deletions.
diff --git a/csw-server/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/SearchController.java b/csw-server/src/main/java/org/fao/geonet/kernel/csw/services/getrecords/SearchController.java
@@ -290,11 +290,11 @@ private static Element applyElementSetName(ServiceContext context, SchemaManager
         String prefix ;
         if (outputSchema == OutputSchema.OGC_CORE) {
             prefix = "ogc";
-        }
-        else if (outputSchema == OutputSchema.ISO_PROFILE || outputSchema == OutputSchema.OWN) {
+        } else if (outputSchema == OutputSchema.ISO_PROFILE) {
             prefix = "iso";
-        }
-        else {
+        } else if (outputSchema == OutputSchema.OWN) {
+            prefix = "own";
+        } else {
             throw new InvalidParameterValueEx("outputSchema not supported for metadata " + id + " schema.", schema);
         }
 

diff --git a/web-ui/src/main/resources/catalog/components/thesaurus/ThesaurusDirective.js b/web-ui/src/main/resources/catalog/components/thesaurus/ThesaurusDirective.js
@@ -35,6 +35,8 @@
              scope.snippet = null;
              scope.snippetRef = null;
 
+             scope.allowFreeTextKeywords = (attrs.allowFreeTextKeywords === undefined) || (attrs.allowFreeTextKeywords == 'true');
+
              // TODO: Remove from list existing thesaurus
              // in the record ?
              gnThesaurusService.getAll().then(

diff --git a/web-ui/src/main/resources/catalog/components/thesaurus/partials/thesaurusselector.html b/web-ui/src/main/resources/catalog/components/thesaurus/partials/thesaurusselector.html
@@ -1,6 +1,6 @@
 <div>
   <div class="btn-group">
-    <button class="btn btn-default" type="button" data-ng-click="add()">
+    <button class="btn btn-default" type="button" data-ng-click="add()" data-ng-show="allowFreeTextKeywords">
       <i class="fa fa-plus gn-add"/>
       <span data-translate="">addKeywordNotFromThesaurus</span>
     </button>

diff --git a/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml b/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml
@@ -480,7 +480,14 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans
                 <!-- Massive update metadata services -->
                 <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/metadata.batch.replace.new!?.*" access="hasRole('Editor')"/>
 
-                <sec:intercept-url pattern="/error" access="permitAll"/>
+                <!-- Reports -->
+                <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/recordsupdated.csv!?.*" access="hasRole('UserAdmin')"/>
+                <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/recordsinternal.csv!?.*" access="hasRole('UserAdmin')"/>
+                <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/users.csv!?.*" access="hasRole('UserAdmin')"/>
+                <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/datauploads.csv!?.*" access="hasRole('UserAdmin')"/>
+                <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/datadownloads.csv!?.*" access="hasRole('UserAdmin')"/>
+
+              <sec:intercept-url pattern="/error" access="permitAll"/>
                 <sec:intercept-url pattern="/home\?.*" access="permitAll"/>
                 <sec:intercept-url pattern="/home" access="permitAll"/>
 

diff --git a/web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/layout/config-editor.xml b/web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/layout/config-editor.xml
@@ -71,6 +71,10 @@
     </for>
 
     <for name="gmd:descriptiveKeywords" addDirective="data-gn-thesaurus-selector"/>
+    <!-- Example of configuration to disable free text keywords in the thesaurus selector -->
+    <!--for name="gmd:descriptiveKeywords" addDirective="data-gn-thesaurus-selector">
+      <directiveAttributes data-allow-free-text-keywords="false" />
+    </for-->
   </fields>
 
 

diff --git a/web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/present/csw/own-brief.xsl b/web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/present/csw/own-brief.xsl
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:import href="iso-brief.xsl"/>
+</xsl:stylesheet>
diff --git a/web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/present/csw/own-full.xsl b/web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/present/csw/own-full.xsl
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:import href="iso-full.xsl"/>
+</xsl:stylesheet>
diff --git a/web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/present/csw/own-summary.xsl b/web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19139/present/csw/own-summary.xsl
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:import href="iso-summary.xsl"/>
+</xsl:stylesheet>