From d57f904f650b765b0bf9af8d1fa95ea64478aefb Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 27 Mar 2020 13:17:38 -0400 Subject: [PATCH] LP1869898 Make Angular staff catalog default Modifies Angular and AngJS templates and AngJS code to use the new Angular staff catalog as the default catalog for new catalog searches, record detail links, etc. The traditional client is left unmodified and remains accessible from the navigation menus. Signed-off-by: Bill Erickson --- .../src/app/staff/cat/vandelay/queue.component.html | 3 +-- Open-ILS/src/eg2/src/app/staff/nav.component.html | 10 ++++------ Open-ILS/src/eg2/src/app/staff/nav.component.ts | 3 +-- Open-ILS/src/eg2/src/app/staff/splash.component.ts | 7 ------- .../src/templates/staff/cat/bucket/copy/t_pending.tt2 | 2 +- .../src/templates/staff/cat/bucket/copy/t_view.tt2 | 2 +- .../templates/staff/cat/bucket/record/t_pending.tt2 | 2 +- .../templates/staff/cat/bucket/record/t_search.tt2 | 2 +- .../src/templates/staff/cat/bucket/record/t_view.tt2 | 2 +- Open-ILS/src/templates/staff/cat/item/t_list.tt2 | 2 +- .../templates/staff/cat/share/t_record_summary.tt2 | 11 ++++------- .../staff/cat/share/t_record_summary_slim.tt2 | 11 ++++------- .../templates/staff/circ/checkin/t_checkin_table.tt2 | 2 +- .../src/templates/staff/circ/holds/t_pull_list.tt2 | 3 +-- .../src/templates/staff/circ/holds/t_shelf_list.tt2 | 2 +- .../staff/circ/patron/t_bill_history_payments.tt2 | 2 +- .../staff/circ/patron/t_bill_history_xacts.tt2 | 2 +- .../src/templates/staff/circ/patron/t_bills_list.tt2 | 2 +- .../src/templates/staff/circ/patron/t_checkout.tt2 | 2 +- .../src/templates/staff/circ/patron/t_holds_list.tt2 | 2 +- .../src/templates/staff/circ/patron/t_items_out.tt2 | 2 +- .../templates/staff/circ/patron/t_xact_details.tt2 | 2 +- Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 | 2 +- Open-ILS/src/templates/staff/circ/transits/t_list.tt2 | 2 +- Open-ILS/src/templates/staff/navbar.tt2 | 19 ++++++++----------- Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 | 2 +- Open-ILS/web/js/ui/default/staff/app.js | 2 +- .../web/js/ui/default/staff/cat/bucket/record/app.js | 6 ++---- Open-ILS/web/js/ui/default/staff/cat/item/app.js | 6 +++--- Open-ILS/web/js/ui/default/staff/cat/z3950/app.js | 9 ++++----- Open-ILS/web/js/ui/default/staff/circ/checkin/app.js | 2 +- .../web/js/ui/default/staff/circ/services/holds.js | 10 ++-------- .../web/js/ui/default/staff/circ/services/item.js | 2 +- Open-ILS/web/js/ui/default/staff/services/navbar.js | 12 ++++++++++-- 34 files changed, 65 insertions(+), 87 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html index b3b39a8a16..480e5548ea 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html @@ -114,10 +114,9 @@ {{row.imported_as}} - + {{row.imported_as}} - diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html index 5310b5b340..80f8873755 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.html +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html @@ -27,7 +27,7 @@ assignment Search for Items by Barcode - search @@ -150,17 +150,15 @@
- search Search the Catalog - + search - Staff Catalog (Experimental) + Search the Catalog (Traditional) - + {{item['call_number.record.simple_record.title']}} diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 index adc1f5013a..7a914bb3b9 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 @@ -42,7 +42,7 @@ - + {{item['call_number.record.simple_record.title']}} diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2 index b313db9815..f636a09231 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_pending.tt2 @@ -18,7 +18,7 @@ handler="resetPendingList"> - + {{item.title}} diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2 index c5cfc342d9..651b3618d4 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_search.tt2 @@ -44,7 +44,7 @@ handler="addToBucket"> - + {{item.title}} diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 index a30697c6e5..26cd353bb2 100644 --- a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 +++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 @@ -35,7 +35,7 @@ - + {{item.title}} 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 fc9ce492a0..6d6e08cde9 100644 --- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 +++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2 @@ -93,7 +93,7 @@ {{item['dummy_title']}} - + {{item['call_number.record.simple_record.title']}} diff --git a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2 b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2 index c98b087034..ce4af2e8e1 100644 --- a/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2 +++ b/Open-ILS/src/templates/staff/cat/share/t_record_summary.tt2 @@ -7,8 +7,7 @@
- + (MARC)
@@ -30,7 +29,7 @@
- + [% l('Record merged to #[_1] on [_2]', '{{record.merged_to()}}', '{{record.merge_date() | date:$root.egDateAndTimeFormat}}') @@ -41,8 +40,7 @@
[% l('Title:') %]
- + {{rec_display.title}}
@@ -64,8 +62,7 @@
[% l('Title:') %]
- + {{rec_display.title}}
diff --git a/Open-ILS/src/templates/staff/cat/share/t_record_summary_slim.tt2 b/Open-ILS/src/templates/staff/cat/share/t_record_summary_slim.tt2 index 7095c5dee6..10719aa2b6 100644 --- a/Open-ILS/src/templates/staff/cat/share/t_record_summary_slim.tt2 +++ b/Open-ILS/src/templates/staff/cat/share/t_record_summary_slim.tt2 @@ -7,8 +7,7 @@
- + (MARC)
@@ -27,7 +26,7 @@
- + [% l('Record merged to #[_1] on [_2]', '{{record.merged_to()}}', '{{record.merge_date() | date:$root.egDateAndTimeFormat}}') @@ -38,8 +37,7 @@
[% l('Title:') %]
- + {{rec_display.title}}
@@ -64,8 +62,7 @@
[% l('Title:') %]
- + {{rec_display.title}}
diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 index 5a27145747..19b1d3358e 100644 --- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 +++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 @@ -96,7 +96,7 @@ path='circ.xact_start'> - + {{item.title}} diff --git a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 index 2348f992cd..eda5f059ef 100644 --- a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 @@ -94,8 +94,7 @@ - + {{item.title}} diff --git a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2 index c385a6f8a2..0bac301e66 100644 --- a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2 @@ -76,7 +76,7 @@ - + {{item.hold.title}} diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2 index 5c31297d9b..e21a3019ad 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2 @@ -21,7 +21,7 @@ - {{item.title}} + {{item.title}} diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2 index 4be0ef08b6..f08b03414d 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2 @@ -25,7 +25,7 @@ - {{item.title}} + {{item.title}} diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 index d622db6c47..ccd7320571 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 @@ -74,7 +74,7 @@ - {{item.title}} + {{item.title}} - + {{item.title}} diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 index 961ad03fc6..d2e8d576ad 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 @@ -66,7 +66,7 @@ - + {{item.mvr.title()}} diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 index b7857aa151..33ef942ddb 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 @@ -96,7 +96,7 @@ - + {{item.target_copy().call_number().record().wide_display_entry().title()}} diff --git a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 index 4d5ff59486..b08cdff7d4 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 @@ -10,7 +10,7 @@
{{xact.summary().total_owed() | currency}}
[% l('Title') %]
- {{title}} + {{title}} {{title}}
diff --git a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 index 0a2caad72a..6447ecce20 100644 --- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 +++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 @@ -121,7 +121,7 @@ path='circ.renewal_remaining'> - + {{item.title}} diff --git a/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 b/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 index d15120021e..0719ed909a 100644 --- a/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 +++ b/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 @@ -57,7 +57,7 @@ - + {{item['target_copy.call_number.record.simple_record.title']}} diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2 index 220c3d1d1f..e6e5345696 100644 --- a/Open-ILS/src/templates/staff/navbar.tt2 +++ b/Open-ILS/src/templates/staff/navbar.tt2 @@ -51,9 +51,9 @@
  • - + eg-accesskey-desc="[% l('Catalog') %]"> [% l('Search the Catalog') %] @@ -245,19 +245,16 @@ [% l('Cataloging') %]
      -
    • - +
    • + - [% l('Search the Catalog') %] + [% l('Search the Catalog') %]
      • - -
    • - +
    • + - [% l('Staff Catalog (Experimental)') %] + [% l('Search the Catalog (Traditional)') %]
    • diff --git a/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 b/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 index 03820d284c..6ca1e40773 100644 --- a/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 +++ b/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 @@ -7,7 +7,7 @@
      {{legacy.mvr.physical_description}} diff --git a/Open-ILS/web/js/ui/default/staff/app.js b/Open-ILS/web/js/ui/default/staff/app.js index 672104676a..58afd0664d 100644 --- a/Open-ILS/web/js/ui/default/staff/app.js +++ b/Open-ILS/web/js/ui/default/staff/app.js @@ -166,7 +166,7 @@ function($routeProvider , $locationProvider) { if (!$scope.cat_query) return; if ($event && $event.keyCode != 13) return; // input ng-keypress $window.location.href = - '/eg/staff/cat/catalog/results?query=' + + '/eg2/staff/catalog/search?query=' + encodeURIComponent($scope.cat_query); } }]) diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js index cdaaaa147b..cd9b9326d4 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js @@ -747,7 +747,7 @@ function($scope, $q , $routeParams, bucketSvc, egCore, $window, args.lead_id, args.records.map(function(val) { return val.id; }) ).then(function() { - $window.open(egCore.env.basePath + 'cat/catalog/record/' + args.lead_id); + $window.open('/eg2/staff/catalog/record/' + args.lead_id); }); }); }); @@ -757,9 +757,7 @@ function($scope, $q , $routeParams, bucketSvc, egCore, $window, // TODO: probably want to set a limit on the number of // new tabs one could choose to open at once angular.forEach(records, function(rec) { - var url = egCore.env.basePath + - 'cat/catalog/record/' + - rec.id; + var url = '/eg2/staff/catalog/record/' + rec.id; $timeout(function() { $window.open(url, '_blank') }); }); } 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 614db62ecf..f5b911c31a 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 @@ -91,7 +91,7 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD } $scope.show_in_catalog = function() { - window.open('/eg/staff/cat/catalog/record/' + $scope.args.recordId + '/catalog', '_blank'); + window.open('/eg2/staff/catalog/record/' + $scope.args.recordId, '_blank'); } $scope.print_labels = function() { @@ -169,7 +169,7 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD } $scope.show_record_holds = function() { - window.open('/eg/staff/cat/catalog/record/' + $scope.args.recordId + '/holds', '_blank'); + window.open('/eg2/staff/catalog/record/' + $scope.args.recordId + '/holds', '_blank'); } $scope.add_item_alerts = function() { @@ -646,7 +646,7 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD $scope.showBibHolds = function () { angular.forEach(gatherSelectedRecordIds(), function (r) { - var url = egCore.env.basePath + 'cat/catalog/record/' + r + '/holds'; + var url = '/eg2/staff/catalog/record/' + r + '/holds'; $timeout(function() { $window.open(url, '_blank') }); }); } diff --git a/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js b/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js index 94d68040e7..e2c363c4c3 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js @@ -185,8 +185,7 @@ function($scope , $q , $location , $timeout , $window, egCore , egGridDataProvi $scope.showInCatalog = function() { var items = $scope.gridControls.selectedItems(); // relying on cant_showInCatalog to protect us - var url = egCore.env.basePath + - 'cat/catalog/record/' + items[0].tcn(); + var url = '/eg2/staff/catalog/record/' + items[0].tcn(); $timeout(function() { $window.open(url, '_blank') }); }; $scope.cant_showInCatalog = function() { @@ -268,7 +267,7 @@ function($scope , $q , $location , $timeout , $window, egCore , egGridDataProvi egCore.strings.GO_TO_RECORD, egCore.strings.GO_BACK ).result.then(function() { - $window.open(egCore.env.basePath + 'cat/catalog/record/' + result.id()); + $window.open('/eg2/staff/catalog/record/' + result.id()); }); } } @@ -322,7 +321,7 @@ function($scope , $q , $location , $timeout , $window, egCore , egGridDataProvi }] }).result.then(function () { if (recId) { - $window.location.href = egCore.env.basePath + 'cat/catalog/record/' + recId; + $window.location.href = '/eg2/staff/catalog/record/' + recId; } }); } @@ -472,7 +471,7 @@ function($scope , $q , $location , $timeout , $window, egCore , egGridDataProvi $scope.local_overlay_target = 0; egCore.hatch.removeLocalItem('eg.cat.marked_overlay_record'); console.debug('overlay complete, target removed'); - $window.open(egCore.env.basePath + 'cat/catalog/record/' + overlay_target); + $window.open('/eg2/staff/catalog/record/' + overlay_target); } ); }); diff --git a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js index 82bd4c8764..eb360c9ff7 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js @@ -380,7 +380,7 @@ function($scope , $q , $window , $location , $timeout , egCore , checkinSvc , eg recordIds.push(i.acn.record()); }); angular.forEach(recordIds, function (r) { - var url = egCore.env.basePath + 'cat/catalog/record/' + r + '/holds'; + var url = '/eg2/staff/catalog/record/' + r + '/holds'; $timeout(function() { $window.open(url, '_blank') }); }); } diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js index dcc1d11e6c..28f071fd18 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js +++ b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js @@ -652,10 +652,7 @@ function($window , $location , $timeout , egCore , egHolds , egCirc) { service.show_holds_for_title = function(items) { var focus = items.length == 1; angular.forEach(items, function(item) { - var url = egCore.env.basePath + - 'cat/catalog/record/' + - item.mvr.doc_id() + - '/holds'; + var url = '/eg2/staff/catalog/record/' + item.mvr.doc_id() + '/holds'; $timeout(function() { var x = $window.open(url, '_blank'); if (focus) x.focus() }); }); } @@ -663,10 +660,7 @@ function($window , $location , $timeout , egCore , egHolds , egCirc) { service.show_holds_for_title_wide = function(items) { var focus = items.length == 1; angular.forEach(items, function(item) { - var url = egCore.env.basePath + - 'cat/catalog/record/' + - item.hold.record_id + - '/holds'; + var url = '/eg2/staff/catalog/record/' + item.hold.record_id + '/holds'; $timeout(function() { var x = $window.open(url, '_blank'); if (focus) x.focus() }); }); } 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 8150f18ea5..d7c43efd0f 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 @@ -998,7 +998,7 @@ function(egCore , egOrg , egCirc , $uibModal , $q , $timeout , $window , ngToast service.show_in_catalog = function(copy_list){ angular.forEach(copy_list, function(copy){ - window.open('/eg/staff/cat/catalog/record/'+copy['call_number.record.id']+'/catalog', '_blank') + window.open('/eg2/staff/catalog/record/'+copy['call_number.record.id'], '_blank') }); } diff --git a/Open-ILS/web/js/ui/default/staff/services/navbar.js b/Open-ILS/web/js/ui/default/staff/services/navbar.js index b6ff1d31fe..8be2de0e7f 100644 --- a/Open-ILS/web/js/ui/default/staff/services/navbar.js +++ b/Open-ILS/web/js/ui/default/staff/services/navbar.js @@ -18,6 +18,14 @@ angular.module('egCoreMod') } function navTo(path) { + + if (path.match(/^\/eg2\//)) { + // Hotkey for /eg2/ page. Go directly to the + // provided URL. + $window.location.href = path; + return; + } + path = path.replace(/^\.\//,''); $window.location.href = egCore.env.basePath + path; } @@ -55,8 +63,8 @@ angular.module('egCoreMod') $scope.retrieveLastRecord = function() { var last_record = egCore.hatch.getLocalItem("eg.cat.last_record_retrieved"); if (last_record) { - $window.location.href = - egCore.env.basePath + 'cat/catalog/record/' + last_record; + $window.location.href = + '/eg2/staff/catalog/record/' + last_record; } } -- 2.11.0