From ef2425e7b36004f22210226ba2b735893750a439 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 19 Jan 2017 11:31:12 -0500 Subject: [PATCH] LP#1646166 Hatch settings migration Support copying all settings from local storage to Hatch and vice versa in the Hatch admin UI. Signed-off-by: Bill Erickson Conflicts: Open-ILS/src/templates/staff/admin/workstation/index.tt2 --- .../templates/staff/admin/workstation/index.tt2 | 6 +++ .../templates/staff/admin/workstation/t_hatch.tt2 | 16 +++++-- .../js/ui/default/staff/admin/workstation/app.js | 22 ++++++++- Open-ILS/web/js/ui/default/staff/services/hatch.js | 54 +++++++++++++++++++++- 4 files changed, 92 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/templates/staff/admin/workstation/index.tt2 b/Open-ILS/src/templates/staff/admin/workstation/index.tt2 index 3f927a4445..41f9a3d687 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/index.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/index.tt2 @@ -15,6 +15,12 @@ angular.module('egCoreMod').run(['egStrings', function(s) { '[% l('Delete content for key "[_1]"?', '{{deleteKey}}') %]'; s.DEFAULT_WS_LABEL = '[% l('[_1] (Default)', '{{ws}}') %]'; s.WS_EXISTS = '[% l("Workstation name already exists. Use it anyway?") %]'; + s.WS_USED = '[% l("Workstation is already registered") %]'; + s.PRINT_TEMPLATES_FAIL_EXPORT = "[% l('There are no customized print template to export') %]"; + s.PRINT_TEMPLATES_SUCCESS_IMPORT = "[% l('Imported one or more print template(s)') %]"; + s.PRINT_TEMPLATES_FAIL_IMPORT = "[% l('Failed to import any print template(s)') %]"; + s.HATCH_SETTINGS_MIGRATION_SUCCESS = "[% l('Settings successfully migrated') %]"; + s.HATCH_SETTINGS_MIGRATION_FAILURE = "[% l('Settings migration failed') %]"; }]); [% END %] 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 d8d87eae11..836c893e9a 100644 --- a/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2 +++ b/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2 @@ -12,7 +12,7 @@
-
+