[open-ils-commits] [GIT] Evergreen ILS branch master updated. fab90985f34028b203a8de46c0f681b310fcb857

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  fab90985f34028b203a8de46c0f681b310fcb857 (commit)
       via  b19a728dbc515dde495174a5c4fb306c42af0291 (commit)
      from  4894212ed19a4ab6d90b9afd8505d71043fc6e93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fab90985f34028b203a8de46c0f681b310fcb857
Author: a. bellenir <ab at grpl.org>
Date:   Tue Jun 12 14:54:18 2018 -0400

    LP#1773434: show in catalog
    
    open a new staff client tab to the record's opac view, not a new opac tab
    
    Signed-off-by: a. bellenir <ab at grpl.org>
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index 9ac1215..3bb09b0 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -978,7 +978,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
 
     service.show_in_catalog = function(copy_list){
         angular.forEach(copy_list, function(copy){
-            window.open('/eg/opac/record/'+copy['call_number.record.id'], '_blank')
+            window.open('/eg/staff/cat/catalog/record/'+copy['call_number.record.id']+'/catalog', '_blank')
         });
     }
 

commit b19a728dbc515dde495174a5c4fb306c42af0291
Author: a. bellenir <ab at grpl.org>
Date:   Mon Jun 4 19:41:55 2018 -0400

    LP#1773434 missing option to "Show in Catalog"
    
    Signed-off-by: a. bellenir <ab at grpl.org>
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 1d250f8..361c997 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -10,6 +10,8 @@
 
   <eg-grid-action handler="add_copies_to_bucket"
     label="[% l('Add Items to Bucket') %]"></eg-grid-action>
+  <eg-grid-action handler="show_in_catalog"
+    label="[% l('Show in Catalog') %]"></eg-grid-action>
   <eg-grid-action handler="make_copies_bookable"
     label="[% l('Make Items Bookable') %]"></eg-grid-action>
   <eg-grid-action handler="book_copies_now"
diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index f797fec..19e45f9 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -554,6 +554,10 @@ function($scope , $q , $routeParams , $location , $timeout , $window , egCore ,
         });
     }
 
+    $scope.show_in_catalog = function(){
+        itemSvc.show_in_catalog(copyGrid.selectedItems());
+    }
+
     if (copyId.length > 0) {
         itemSvc.fetch(null,copyId).then(
             function() {
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index 6fab179..9ac1215 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -976,6 +976,12 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
         });
     }
 
+    service.show_in_catalog = function(copy_list){
+        angular.forEach(copy_list, function(copy){
+            window.open('/eg/opac/record/'+copy['call_number.record.id'], '_blank')
+        });
+    }
+
     return service;
 }])
 .filter('string_pick', function() { return function(i){ return arguments[i] || ''; }; })

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/cat/item/t_list.tt2   |    2 ++
 Open-ILS/web/js/ui/default/staff/cat/item/app.js   |    4 ++++
 .../web/js/ui/default/staff/circ/services/item.js  |    6 ++++++
 3 files changed, 12 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS