Merge remote-tracking branch 'origin/3.2.x' into develop

geonetwork · Mar 10, 2017 · a106a32 · a106a32
2 parents 2d1a129 + 5ef4051
commit a106a32
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -343,7 +343,7 @@
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-all</artifactId>
-        <version>2.3.7</version>
+        <version>2.3.11</version>
       </dependency>
 
       <!-- universal character set detector -->
@@ -444,7 +444,7 @@
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
       </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
@@ -474,7 +474,7 @@
       <dependency>
         <groupId>batik</groupId>
         <artifactId>batik-ext</artifactId>
-        <version>1.6</version>
+        <version>1.6-1</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -984,17 +984,17 @@
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.5</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.5</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.5</version>
       </dependency>
       <dependency>
         <groupId>javax.xml.bind</groupId>
@@ -1258,7 +1258,7 @@
     <xmlunit.version>2.1.1</xmlunit.version>
     <print-lib.version>2.1.1</print-lib.version>
     <flying-saucer>9.0.7</flying-saucer>
-    <camel.version>2.14.0</camel.version>
+    <camel.version>2.14.4</camel.version>
     <log4j.version>1.2.17</log4j.version>
     <slf4j.version>1.7.7</slf4j.version>
     <xbean.version>3.18</xbean.version>

diff --git a/software_development/README.md b/software_development/README.md
@@ -206,6 +206,11 @@ and then execute the following maven command::
 
 After a moment, GeoNetwork should be accessible at: http://localhost:8080/geonetwork
 
+For changes related to the user interface in the `web-ui` module or the metadata schemas in the `schemas` module, can be deployed in jetty executing the following maven command in the **web** module::
+
+    $ mvn process-resources
+
+
 ### Source code documentation
 
 The GeoNetwork Java source code is based on Javadoc. Javadoc is a tool for

diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionsDirective.js b/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionsDirective.js
@@ -296,8 +296,8 @@
         link: function(scope, element, attrs) {
           var ownerId = parseInt(attrs['gnTransferMdOwner']);
           var groupOwner = parseInt(attrs['gnTransferMdGroupOwner']);
-          var bucket = attrs['gnTransferMdGroupOwner'];
-          var mdUuid = attrs['selectionBucket'];
+          var bucket = attrs['selectionBucket'];
+          var mdUuid = attrs['gnTransferOwnership'];
           scope.selectedUserGroup = null;
 
           scope.selectUser = function(user) {
@@ -331,8 +331,13 @@
               });
 
           scope.save = function() {
-            return $http.put('../api/records/' + mdUuid +
-                '/ownership?userIdentifier=' + scope.selectedUserGroup.userId +
+            var url = '../api/records/';
+            if (bucket != 'null') {
+              url += 'ownership?bucket=' + bucket + '&';
+            } else {
+              url += mdUuid + '/ownership?';
+            }
+            return $http.put(url + 'userIdentifier=' + scope.selectedUserGroup.userId +
                 '&groupIdentifier=' + scope.selectedUserGroup.groupId)
                 .then(function(r) {
                   $rootScope.$broadcast('StatusUpdated', {

diff --git a/web-ui/src/main/resources/catalog/views/default/directives/partials/mdactionmenu.html b/web-ui/src/main/resources/catalog/views/default/directives/partials/mdactionmenu.html
@@ -18,7 +18,7 @@
       </a></li>
       <li data-ng-if="md.isOwned() && user.isUserAdminOrMore()">
         <a data-ng-href=""
-           data-ng-click="mdService.openTransferOwnership(md, getCatScope())">
+           data-ng-click="mdService.openTransferOwnership(md, null, getCatScope())">
           <i class="fa fa-user"></i>&nbsp;
           <span data-translate="">transferOwnership</span>
         </a></li>

diff --git a/web/src/main/webapp/WEB-INF/classes/log4j-index.xml b/web/src/main/webapp/WEB-INF/classes/log4j-index.xml
@@ -70,7 +70,7 @@
     <level value="WARN"/>
   </logger>
   <logger name="geonetwork.harvester" additivity="false">
-    <level value="WARN"/>
+    <level value="INFO"/>
     <appender-ref ref="consoleAppender"/>
     <appender-ref ref="fileAppender"/>
   </logger>

diff --git a/web/src/main/webapp/WEB-INF/classes/log4j-search.xml b/web/src/main/webapp/WEB-INF/classes/log4j-search.xml
@@ -70,7 +70,7 @@
     <level value="DEBUG"/>
   </logger>
   <logger name="geonetwork.harvester" additivity="false">
-    <level value="WARN"/>
+    <level value="INFO"/>
     <appender-ref ref="consoleAppender"/>
     <appender-ref ref="fileAppender"/>
   </logger>

diff --git a/web/src/main/webapp/WEB-INF/classes/log4j.xml b/web/src/main/webapp/WEB-INF/classes/log4j.xml
@@ -82,7 +82,7 @@
     <level value="WARN"/>
   </logger>
   <logger name="geonetwork.harvester" additivity="false">
-    <level value="WARN"/>
+    <level value="INFO"/>
     <appender-ref ref="consoleAppender"/>
     <appender-ref ref="fileAppender"/>
   </logger>

diff --git a/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl b/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl
@@ -651,8 +651,8 @@
     <!--<xsl:message>## Add action</xsl:message>
     <xsl:message><xsl:copy-of select="."/></xsl:message>
     <xsl:message>Is displayed: <xsl:copy-of select="$isDisplayed"/> because no if provided or if attribute XPath '<xsl:value-of select="@if"/>' expression found a match.</xsl:message>
-    <xsl:message> = Display action <xsl:value-of select="$nonExistingChildParent/* and $isDisplayed = 'true'"/></xsl:message>
-    -->
+    <xsl:message> = Display action <xsl:value-of select="$nonExistingChildParent/* and $isDisplayed = 'true'"/></xsl:message>-->
+
     <xsl:if test="$nonExistingChildParent/* and $isDisplayed = 'true'">
       <xsl:variable name="childName" select="@or"/>
 
@@ -665,8 +665,10 @@
                     select="if ($btnOverrideName)
                             then $strings/*[name() = $btnOverrideName]
                             else ''"/>
+
+      <!-- If multiple elements $elementName contains multiple values. Use the first one in getLabel to avoid failure. -->
       <xsl:variable name="labelConfig"
-                    select="gn-fn-metadata:getLabel($schema, $elementName, $labels)"/>
+                    select="gn-fn-metadata:getLabel($schema, $elementName[1], $labels)"/>
       <xsl:variable name="name"
                     select="if ($btnName != '')
                             then $btnName