Merge pull request #2108 from dzhw/release

Release v1.0.81
dzhw · Mar 22, 2019 · db34025 · db34025
2 parents bf83050 + c903205
commit db34025
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/webapp/scripts/searchmanagement/directives/next-search-result.directive.js b/src/main/webapp/scripts/searchmanagement/directives/next-search-result.directive.js
@@ -1,8 +1,9 @@
+/* global _ */
 'use strict';
 
 angular.module('metadatamanagementApp').directive('nextSearchResult',
   function(SearchResultNavigatorService, SearchTypeToDetailsStateMapper,
-           $state) {
+           $state, Principal) {
     return {
       restrict: 'E',
       templateUrl: 'scripts/searchmanagement/directives/' +
@@ -22,8 +23,10 @@ angular.module('metadatamanagementApp').directive('nextSearchResult',
 
               scope.goToNextSearchResult = function() {
                 $state.go(state, {
-                  id: id, 'search-result-index':
-                  scope.nextSearchResultIndex
+                  id: id,
+                  'search-result-index': scope.nextSearchResultIndex,
+                  version: Principal.loginName() ? undefined
+                    : _.get(scope.nextSearchResult, 'release.version')
                 });
               };
             }

diff --git a/src/main/webapp/scripts/searchmanagement/directives/previous-search-result.directive.js b/src/main/webapp/scripts/searchmanagement/directives/previous-search-result.directive.js
@@ -1,8 +1,9 @@
+/* global _ */
 'use strict';
 
 angular.module('metadatamanagementApp').directive('previousSearchResult',
   function(SearchResultNavigatorService, SearchTypeToDetailsStateMapper,
-           $state) {
+           $state, Principal) {
     return {
       restrict: 'E',
       templateUrl: 'scripts/searchmanagement/directives/' +
@@ -23,7 +24,10 @@ angular.module('metadatamanagementApp').directive('previousSearchResult',
 
               scope.goToPreviousSearchResult = function() {
                 $state.go(state, {
-                  id: id, 'search-result-index': scope.previousSearchResultIndex
+                  id: id,
+                  'search-result-index': scope.previousSearchResultIndex,
+                  version: Principal.loginName() ? undefined :
+                    _.get(scope.previousSearchResult, 'release.version')
                 });
               };
             }