Merge pull request #2842 from dzhw/release

Release v1.0.108-HOTFIX

Author: René Reitmann

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Metadatamanagement",
-  "version": "1.0.108",
+  "version": "1.0.108-HOTFIX",
   "description": "Data Search for Higher Education Research and Science Studies",
   "private": true,
   "dependencies": {

package.json

@@ -11,7 +11,7 @@
 
     <groupId>eu.dzhw.fdz</groupId>
     <artifactId>metadatamanagement</artifactId>
-    <version>1.0.108</version>
+    <version>1.0.108-HOTFIX</version>
     <packaging>war</packaging>
     <name>metadatamanagement</name>
 

pom.xml

@@ -6,7 +6,7 @@ angular.module('metadatamanagementApp')
 
 .constant('ENV', 'local')
 
-.constant('VERSION', '1.0.108')
+.constant('VERSION', '1.0.108-HOTFIX')
 
 .constant('ElasticSearchProperties', {apiVersion:'7.x',logLevel:'error',pageSize:10})
 

src/main/webapp/scripts/app.constants.js

@@ -34,7 +34,7 @@
       <span class="fdz-paginator__label">{{$ctrl.options.pageObject.size*($ctrl.options.pageObject.page-1)+1}} - {{$ctrl.calculateCurrentPage()}} {{'global.pagination.of'|translate}} {{$ctrl.options.pageObject.totalHits}}</span>
       <md-button
         class="fdz-paginator__button"
-        ng-if="$ctrl.options.pageObject.page <= 1" disabled="true">
+        ng-if="$ctrl.options.pageObject.page <= 1 || $ctrl.options.pageObject.page - 1 >= ($ctrl.options.pageObject.totalHits / $ctrl.options.pageObject.size)" disabled="true">
         <md-icon
           class="md-primary"
           md-font-set="material-icons">keyboard_arrow_left
@@ -43,7 +43,7 @@
       <md-button
         class="fdz-paginator__button" rel="prev"
         ui-sref="({page: $ctrl.options.pageObject.page - 1})"
-        ng-if="$ctrl.options.pageObject.page > 1">
+        ng-if="$ctrl.options.pageObject.page > 1 && $ctrl.options.pageObject.page - 1 < ($ctrl.options.pageObject.totalHits / $ctrl.options.pageObject.size)">
         <md-icon
           class="md-primary"
           md-font-set="material-icons">keyboard_arrow_left

src/main/webapp/scripts/common/paginator/fdzPaginatorTemplate.html.tmpl

@@ -77,8 +77,6 @@ angular.module('metadatamanagementApp')
             if (existingPublications[objects[uploadCount].id]) {
               existingPublications[objects[uploadCount].id].presentInExcel =
                 true;
-              objects[uploadCount].dataPackageIds =
-                existingPublications[objects[uploadCount].id].dataPackageIds;
             }
             objects[uploadCount].$save().then(function() {
               JobLoggingService.success();

src/main/webapp/scripts/relatedpublicationmanagement/services/relatedPublicationUpload.service.js

@@ -26,39 +26,32 @@
         <md-list-item ng-if="$ctrl.options.sourceReference">
           <h5>{{'related-publication-management.detail.label.sourceReference' | translate }}:</h5>
           <span
-            class="md-secondary" lang="{{$ctrl.options.language}}">{{$ctrl.options.sourceReference}}</span>
+            class="md-secondary" lang="{{$ctrl.options.language}}" style="word-break: break-word;">{{$ctrl.options.sourceReference}}</span>
         </md-list-item>
         <md-list-item ng-if="$ctrl.options.doi">
           <h5>{{'related-publication-management.detail.label.doi' | translate }}:</h5>
-          <span
-            class="md-secondary">
-            <a
-              ng-href="https://dx.doi.org/{{$ctrl.options.doi}}"
-              target="_blank">
+          <a class="md-secondary"
+            ng-href="https://dx.doi.org/{{$ctrl.options.doi}}"
+            target="_blank">
               {{$ctrl.options.doi}}
-              <md-tooltip
-                md-autohide="true"
-                md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
-                  {{'related-publication-management.detail.doi-tooltip' | translate}}
-              </md-tooltip>
-            </a>
-          </span>
+            <md-tooltip
+              md-autohide="true"
+              md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+                {{'related-publication-management.detail.doi-tooltip' | translate}}
+            </md-tooltip>
+          </a>
         </md-list-item>
         <md-list-item ng-if="$ctrl.options.sourceLink">
           <h5>{{'related-publication-management.detail.label.sourceLink' | translate }}:</h5>
-          <span
-            class="md-secondary">
-            <a
-              class="fdz-truncate-string"
-              ng-href="{{$ctrl.options.sourceLink}}" style="display: block;"
+          <a class="md-secondary fdz-truncate-string"
+              ng-href="{{$ctrl.options.sourceLink}}"
               target="_blank">{{$ctrl.options.sourceLink}}
-                <md-tooltip
-                  md-autohide="true"
-                  md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
+              <md-tooltip
+                md-autohide="true"
+                md-z-index="bowser.mobile || bowser.tablet ? -100 : 100001">
                   {{'related-publication-management.detail.sourceLink-tooltip' | translate}}
-                </md-tooltip>
-              </a>
-          </span>
+              </md-tooltip>
+          </a>
         </md-list-item>
         <md-list-item ng-if="$ctrl.options.annotations">
           <h5>{{'related-publication-management.detail.label.annotations' | translate }}:</h5>

src/main/webapp/scripts/relatedpublicationmanagement/templates/common-details.html.tmpl

@@ -19,12 +19,7 @@ angular.module('metadatamanagementApp')
         ctrl.relatedPublication = result;
         // We need this for the tab creation
         ctrl.counts = {};
-        ctrl.counts.dataSetsCount = 0;
-        ctrl.counts.variablesCount = 0;
         ctrl.counts.dataPackagesCount = 0;
-        ctrl.counts.instrumentsCount = 0;
-        ctrl.counts.questionsCount = 0;
-        ctrl.counts.surveysCount = 0;
 
         PageMetadataService.setPageTitle('related-publication-management.' +
         'detail.title', {