From 219ad430f60d9521aeb291f28b2e32f77bc988ed Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 5 Aug 2020 14:19:52 -0400 Subject: [PATCH] LP1774008 Remove Hatch storage options Remove option to store settings in Hatch from the AngJS Hatch admin page. Update some Hatch labels to remove the term 'Storage'. Remove deprecated JS code related to tracking this setting and the long-deprecated offline file storage setting. Signed-off-by: Bill Erickson Signed-off-by: Terran McCanna Signed-off-by: Jason Boyer --- .../staff/admin/workstation/t_hatch.tt2 | 29 +---------------- .../staff/admin/workstation/t_splash.tt2 | 2 +- .../ui/default/staff/admin/workstation/app.js | 31 ------------------- 3 files changed, 2 insertions(+), 60 deletions(-) diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2 index bec3bf21cf..51f22fd914 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2 @@ -1,6 +1,6 @@
-

[% l('Print / Storage Service ("Hatch")') %]

+

[% l('Print Service ("Hatch")') %]

[% l("Hatch is Available") %] @@ -22,33 +22,6 @@
- -
-
-
[% l('Storing settings in Hatch is deprecated') %]
-
- [% l("If 'Store Local Settings in Hatch' is enabled, use the 'Copy Hatch Settings To Local Storage' button before disabling 'Store Local Settings in Hatch'") %] -
-
-
- -
-
-
- -
-
-
- -
-
- diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 index 345f7db6d3..61a8d08fe8 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 @@ -44,7 +44,7 @@ diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js index d01ccd50ca..48773347a4 100644 --- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js +++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js @@ -1020,8 +1020,6 @@ function($scope , egCore , ngToast) { var hatch = egCore.hatch; // convenience $scope.hatch_available = hatch.hatchAvailable; - $scope.hatch_settings = hatch.useSettings(); - $scope.hatch_offline = hatch.useOffline(); hatch.usePrinting().then(function(answer) { $scope.hatch_printing = answer; @@ -1033,35 +1031,6 @@ function($scope , egCore , ngToast) { if (typeof newval != 'boolean') return; hatch.setItem('eg.hatch.enable.printing', newval); }); - - $scope.$watch('hatch_settings', function(newval) { - if (typeof newval != 'boolean') return; - hatch.setLocalItem('eg.hatch.enable.settings', newval); - }); - - $scope.$watch('hatch_offline', function(newval) { - if (typeof newval != 'boolean') return; - hatch.setLocalItem('eg.hatch.enable.offline', newval); - }); - - $scope.copy_to_hatch = function() { - hatch.copySettingsToHatch().then( - function() { - ngToast.create(egCore.strings.HATCH_SETTINGS_MIGRATION_SUCCESS)}, - function() { - ngToast.warning(egCore.strings.HATCH_SETTINGS_MIGRATION_FAILURE)} - ); - } - - $scope.copy_to_local = function() { - hatch.copySettingsToLocal().then( - function() { - ngToast.create(egCore.strings.HATCH_SETTINGS_MIGRATION_SUCCESS)}, - function() { - ngToast.warning(egCore.strings.HATCH_SETTINGS_MIGRATION_FAILURE)} - ); - } - }]) /* -- 2.43.2