Merge branch '3.0.x' of github.com:geonetwork/core-geonetwork into de…

…velop Conflicts: cachingxslt/pom.xml code_quality/findbugs-excludes.xml common/pom.xml core/pom.xml csw-server/pom.xml docs/manuals docs/pom.xml domain/pom.xml e2e-tests/pom.xml events/pom.xml geoserver harvesters/pom.xml healthmonitor/pom.xml inspire-atom/pom.xml installer/build.xml jmeter/pom.xml oaipmh/pom.xml pom.xml schemas-test/pom.xml schemas/csw-record/pom.xml schemas/dublin-core/pom.xml schemas/iso19110/pom.xml schemas/iso19139/pom.xml schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl schemas/iso19139/src/main/plugin/iso19139/loc/cat/codelists.xml schemas/iso19139/src/main/plugin/iso19139/loc/cat/labels.xml schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml schemas/iso19139/src/main/plugin/iso19139/loc/spa/labels.xml schemas/pom.xml schemas/schema-core/pom.xml sde/pom.xml services/pom.xml services/src/main/java/org/fao/geonet/services/user/Update.java web-client/pom.xml web-ui-docs/pom.xml web-ui/pom.xml web-ui/src/main/resources/catalog/components/utility/UtilityDirective.js web-ui/src/main/resources/catalog/js/admin/UserGroupController.js web-ui/src/main/resources/catalog/locales/es-search.json web-ui/src/main/resources/catalog/views/default/templates/recordView.html web/pom.xml web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql web/src/main/webapp/WEB-INF/config-db/database_migration.xml web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml web/src/main/webapp/WEB-INF/server.prop wro4j/pom.xml
geonetwork · Oct 24, 2016 · e48d5fb · e48d5fb
2 parents 8250214 + db07ba8
commit e48d5fb
Show file tree

Hide file tree

Showing 26 changed files with 292 additions and 18 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -21,7 +21,6 @@
   ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
-
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

diff --git a/csw-server/pom.xml b/csw-server/pom.xml
@@ -21,7 +21,6 @@
   ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
-
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

diff --git a/docs/changes3.0.5-0.txt b/docs/changes3.0.5-0.txt
@@ -0,0 +1,91 @@
+================================================================================
+===
+=== GeoNetwork 3.0.5: List of changes
+===
+================================================================================
+- Set all privileges option is un-labelled in batch privileges form #1686
+- Apply in 3.0.x the commit 822f813c495cfc2c326ffc4713298cf878ae126f: when you don't administer a group, privileges associated to …that group of the user you are editing should remain static.
+- Use POST for user update and reset password services #1684
+- Adding missing translations
+- Merge pull request #1124 from grootstebozewolf/NioPathAwareCatalogResolverFix
+- Merge pull request #1669 from josegar74/improvements/anchor-href
+- Merge pull request #1683 from oscarfonts/3.0.x
+- Fenomen, Feature => Objecte Geogràfic
+- Catalan & Spanish updates from Transifex
+- More catalan & spanish translations
+- Citation identifier 3.14
+- Extracte => Resum 3.13
+- Voice => Telephon
+- Typo. 3.4
+- Translated <abbrLabel>s. 2.13
+- Tanslation correction. 2.6
+- Label for gmd:CI_OnLineFunctionCode (2.5)
+- Revisión 2.3
+- Rename loc files
+- Add Finnish translations to UI
+- Xslt formatter: multilingual fields are not rendered properly #1675
+- Display links in gmx:Anchor (used for gmd:useLimitation) with hyperlinks in metadata views
+- Search for "<script" instead of "<"
+- "Security" Bug Fixing: Escaping javascript XSS on error messages
+- #1577  Publish button should be disabled if metadata record does not validate (#1659)
+- Search statistics return all the same graphs #1661
+- Update en-core.json (#1652)
+- Update en-search.json (#1651)
+- Update en-admin.json (#1650)
+- #1603 Force csw:Record outputschema in GetRecords for CSW harvester to retrieve uuid,change date of remote records
+- #1603 Retrieve for SimpleMetadata (used in harvesters) the date in the format stored instead of only short format
+- Adding copyright and styling issues
+- Fixes #1555
+- Multinode / Fix mix of users.
+- Transifex update
+- Fixing bug: when showing labels on add buttons that use prefix, strings didn't behave right
+- Fix for unit tests
+- formatter: check code on 2 and 3 characters for multilingual fields
+- Link dataset to service fails #1495. Applied code from develop branch that was fixing this
+- #1539 Denominator range queries doesn't work as expected
+- Fixes  #1563
+- Fixes #1520
+- Fixes #1187
+- Fixes #1531
+- add special case 3char -> 2char code mapping in javascript
+- #1550: fix a dup entry in ISO19139 German loc file
+- #1549: fix ISO2 code for German
+- #1545: Update Spring version to support Java 8
+- Merge pull request #1542 from oscarfonts/xml-translations-es-ca
+- Spanish and Catalan translations for iso19139 XML files
+- Merge branch 'oscarfonts-i18n-es-ca' into 3.0.x
+- Merge branch 'i18n-es-ca' of https://github.com/oscarfonts/core-geonetwork into oscarfonts-i18n-es-ca
+- Updating locales with Transifex
+- Adding catalan to the transifex script
+- Remove culr and wget from the list of "non-session crawlers"
+- Memory bug fixed: Do not create httpSessions for crawlers/bots-
+- Fixes for CSW harvesting #1267 #1429 #1355
+- Additional json translation files
+- Spanish & Catalan UI translations
+- CSW Update - partial updates are not working if xpath provided starts with the metadata root element #1529
+- Fixing missing service config security that made editing of users remove their groups per profile.
+- Improved version of Xml.filterElementValues that allows to define the namespace for the attribute also
+- Fixes  #1504
+- Fixes #1505
+- Use proxy settings in region getmap service #1528
+- Update GeoServer submodule.
+- Merge pull request #1512 from OpenBfS/jdbc_port_configurable-3.0.x
+- Merge pull request #1194 from Delawen/shibboleth_improvements
+- Merge branch '3.0.x' of github.com:geonetwork/core-geonetwork into 3.0.x
+- Merge branch 'josegar74-fix/field-name-fix-mysql' into 3.0.x
+- Merge branch 'fix/field-name-fix-mysql' of https://github.com/josegar74/core-geonetwork into josegar74-fix/field-name-fix-mysql
+- Merge pull request #1457 from pmauduit/domain-parametrized-query
+- #1519 Delete harvester history button doesn't refresh the history panel
+- SDS: fix SDS tab conditional visibility.
+- replaced static port 5432 in postgres.xml to support dynamic port configuration using jdbc.port from jdbc.properties
+- SDS: align GER string files.
+- Merge pull request #1499 from geosolutions-it/3.0.x_INSPIRE-SDS-squashed
+- #1445: Implement INSPIRE Spatial Data Services (SDS)
+- Metadata editor layout: Handle forceLabel attribute in field rendering
+- Metadata editor: handle readonly attribute in field rendering
+- #1498 Map viewer: config-viewer.xml is not loaded when using an external data directory
+- Update version to 3.0.5-SNAPSHOT
+- Rename field 'key' for HarvesterData table as 'key' is a reserved work, to avoid issues when creating the table by Hibernate is some databases like MySql
+- domain - fixing SQLi
+- Fixing shibboleth configuration for latest changes (new filterchain for authentication and some non-autowired objects)
+- Added exception for path resolver.
diff --git a/domain/pom.xml b/domain/pom.xml
@@ -21,7 +21,6 @@
   ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
-
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml
@@ -21,7 +21,6 @@
   ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
-
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

diff --git a/harvesters/pom.xml b/harvesters/pom.xml
@@ -21,7 +21,6 @@
   ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
-
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml
@@ -21,7 +21,6 @@
   ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
-
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<<<<<<< HEAD
 <!--
   ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
   ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
@@ -21,7 +22,6 @@
   ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
-
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

diff --git a/schemas/iso19139/src/main/plugin/iso19139/formatter/groovy/iso19139/Functions.groovy b/schemas/iso19139/src/main/plugin/iso19139/formatter/groovy/iso19139/Functions.groovy
@@ -49,6 +49,15 @@ public class Functions {
     def isoUrlText = { el ->
         el.'gmd:URL'.text()
     }
+
+    def isoAnchorUrlLink = { el ->
+        el.'gmx:Anchor'['@xlink:href'].text()
+    }
+
+    def isoAnchorUrlText = { el ->
+        el.'gmx:Anchor'.text()
+    }
+
     def isoText = { el ->
         def uiCode2 = '#'+env.lang2.toUpperCase()
         def uiCode3 = '#'+env.lang3.toUpperCase()

diff --git a/schemas/iso19139/src/main/plugin/iso19139/formatter/groovy/iso19139/Handlers.groovy b/schemas/iso19139/src/main/plugin/iso19139/formatter/groovy/iso19139/Handlers.groovy
@@ -53,6 +53,7 @@ public class Handlers {
         handlers.add name: 'Text Elements', select: matchers.isTextEl, isoTextEl
         handlers.add name: 'Simple Text Elements', select: matchers.isSimpleTextEl, isoSimpleTextEl
         handlers.add name: 'URL Elements', select: matchers.isUrlEl, isoUrlEl
+        handlers.add name: 'Anchor URL Elements', select: matchers.isAnchorUrlEl, isoAnchorUrlEl
         handlers.add name: 'Simple Elements', select: matchers.isBasicType, isoBasicType
         handlers.add name: 'Boolean Elements', select: matchers.isBooleanEl, isoBooleanEl
         handlers.add name: 'CodeList Elements', select: matchers.isCodeListEl, isoCodeListEl
@@ -106,6 +107,7 @@ public class Handlers {
 
     def isoTextEl = { isofunc.isoTextEl(it, isofunc.isoText(it))}
     def isoUrlEl = { isofunc.isoUrlEl(it, isofunc.isoUrlText(it), isofunc.isoUrlText(it))}
+    def isoAnchorUrlEl = { isofunc.isoUrlEl(it, isofunc.isoAnchorUrlLink(it), isofunc.isoAnchorUrlText(it))}
     def isoDatasetUriEl = { isofunc.isoUrlEl(it, isofunc.isoText(it), isofunc.isoText(it))}
     def isoCodeListEl = {isofunc.isoTextEl(it, f.codelistValueLabel(it))}
     def isoBasicType = {isofunc.isoTextEl(it, it.'*'.text())}

diff --git a/schemas/iso19139/src/main/plugin/iso19139/formatter/groovy/iso19139/Matchers.groovy b/schemas/iso19139/src/main/plugin/iso19139/formatter/groovy/iso19139/Matchers.groovy
@@ -29,6 +29,7 @@ public class Matchers {
     def env
 
     def isUrlEl = {!it.'gmd:URL'.text().isEmpty()}
+    def isAnchorUrlEl = {!it.'gmx:Anchor'['@xlink:href'].text().isEmpty()}
     def simpleElements = ['gco:Decimal', 'gco:Integer', 'gco:Scale', 'gco:Angle', 'gco:Measure', 'gco:Distance',
                           'gmd:MD_PixelOrientationCode', 'gts:TM_PeriodDuration']
 
@@ -60,7 +61,7 @@ public class Matchers {
 
     def isContainerEl = {el ->
         !isBasicType(el) && !isSimpleTextEl(el) &&
-                !isTextEl(el) && !isUrlEl(el) &&
+                !isTextEl(el) && !isUrlEl(el) && !isAnchorUrlEl(el) &&
                 !isCodeListEl(el) && !hasCodeListChild(el) &&
                 !isDateEl(el) && !hasDateChild(el) &&
                 !el.children().isEmpty()

diff --git a/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl b/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl
@@ -366,6 +366,21 @@
                    store="true" index="true"/>
           </xsl:if>
 
+                <xsl:for-each select="gmd:useLimitation/gco:CharacterString">
+                    <Field name="{$fieldPrefix}UseLimitation"
+                           string="{string(.)}" store="true" index="true"/>
+                </xsl:for-each>
+
+                <xsl:for-each select="gmd:useLimitation/gmx:Anchor[not(string(@xlink:href))]">
+                    <Field name="{$fieldPrefix}UseLimitation"
+                           string="{string(.)}" store="true" index="true"/>
+                </xsl:for-each>
+
+                <xsl:for-each select="gmd:useLimitation/gmx:Anchor[string(@xlink:href)]">
+                    <Field name="{$fieldPrefix}UseLimitation"
+                           string="{concat('link|',string(@xlink:href), '|', string(.))}" store="true" index="true"/>
+                </xsl:for-each>
+            </xsl:for-each>
 
           <xsl:if test="$indexAllKeywordDetails and $thesaurusIdentifier != ''">
             <!-- field thesaurus-{{thesaurusIdentifier}}={{keyword}} allows

diff --git a/services/pom.xml b/services/pom.xml
@@ -21,7 +21,6 @@
   ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
   ~ Rome - Italy. email: geonetwork@osgeo.org
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

diff --git a/services/src/main/java/org/fao/geonet/services/user/Update.java b/services/src/main/java/org/fao/geonet/services/user/Update.java
@@ -154,6 +154,25 @@ OkResponse run(
 
         checkAccessRights(operation, id, username, myProfile, myUserId, groups, userGroupRepository);
 
+        //If it is a useradmin updating,
+        //maybe we don't know all the groups the user is part of
+        if(!myProfile.equals(Profile.Administrator) && !Params.Operation.NEWUSER.equalsIgnoreCase(operation)) {
+            List<Integer> myUserAdminGroups = userGroupRepository.findGroupIds(Specifications.where(
+                    hasProfile(myProfile)).and(hasUserId(Integer.valueOf(myUserId))));
+
+            List<UserGroup> usergroups =
+                    userGroupRepository.findAll(Specifications.where(
+                            hasUserId(Integer.parseInt(id))));
+
+            //keep unknown groups as is
+            for(UserGroup ug : usergroups) {
+                if(!myUserAdminGroups.contains(ug.getGroup().getId())) {
+                    groups.add(new GroupElem(ug.getProfile().name(),
+                            ug.getGroup().getId()));
+                }
+            }
+        }
+
         User user = getUser(userRepository, operation, id, username);
 
 

diff --git a/web-client/pom.xml b/web-client/pom.xml
@@ -0,0 +1,77 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.geonetwork-opensource</groupId>
+    <artifactId>geonetwork</artifactId>
+    <version>3.0.6-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>geonetwork-client</artifactId>
+  <packaging>jar</packaging>
+  <name>GeoNetwork web client module</name>
+  <description>GUI components in order to easily build applications based on GeoNetwork server module.</description>
+
+  <licenses>
+    <license>
+      <name>General Public License (GPL)</name>
+      <url>http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+
+  <!-- FIXME set common dependencies to the root pom.xml  -->
+  <dependencies> </dependencies>
+
+  <build>
+    <resources>
+        <!-- The resource that are filtered should only be the fewest possible because
+             It makes the build take longer and if a file that should not have replacements done is filtered
+             the resulting file in the webapp can be wrong.  
+             
+             So only include the specific files to be filtered to keep the build as performant as possible
+             and reduce potential for bugs
+        -->
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+          <includes>
+              <include>**/web-client-wro-sources.xml</include>
+          </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+          <excludes>
+              <exclude>**/web-client-wro-sources.xml</exclude>
+          </excludes>
+      </resource>
+    </resources>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.1.2</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
+  <properties>
+    <geonetwork.build.dir>${project.build.directory}/${project.build.finalName}</geonetwork.build.dir>
+    <minify.verbose>false</minify.verbose>
+  </properties>
+</project>
diff --git a/web-ui/src/main/resources/catalog/components/common/share/partials/panel.html b/web-ui/src/main/resources/catalog/components/common/share/partials/panel.html
@@ -43,6 +43,7 @@ <h5 translate>whoCanAccess</h5>
           <i data-ng-if="sorter.predicate == 'p'" class="fa"
              ng-class="sorter.reverse ? 'fa-long-arrow-up' : 'fa-long-arrow-down'"></i>
         </a>
+        <span data-ng-if="!disableAllCol" translate>setall</span>
         </th>
       </tr>
       </thead>

diff --git a/web-ui/src/main/resources/catalog/components/utility/UtilityDirective.js b/web-ui/src/main/resources/catalog/components/utility/UtilityDirective.js
@@ -1109,4 +1109,42 @@
       }
     };
   }]);
+
+  });
+
+  /**
+   * @ngdoc directive
+   * @name gn_utility.directive:gnLynky
+   *
+   * @description
+   * If the text provided contains the following format:
+   * link|URL|Text, it's converted to an hyperlink, otherwise
+   * the text is displayed without any formatting.
+   *
+   */
+  module.directive('gnLynky', ['$compile',
+    function($compile) {
+      return {
+        restrict: 'A',
+        scope: {
+          text: '@gnLynky'
+        },
+        link: function(scope, element, attrs) {
+          if (scope.text.startsWith('link') &&
+              scope.text.split('|').length == 3) {
+            scope.link = scope.text.split('|')[1];
+            scope.value = scope.text.split('|')[2];
+
+            element.replaceWith($compile('<a data-ng-href="{{link}}" ' +
+                'data-ng-bind-html="value"></a>')(scope));
+          } else {
+
+            element.replaceWith($compile('<span ' +
+                'data-ng-bind-html="text"></span>')(scope));
+          }
+        }
+
+      };
+    }
+  ]);
 })();