From 110958e94937e3735c19bb6a1b02b0dbbaade887 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Fri, 9 Jun 2017 14:27:56 -0400
Subject: [PATCH] webstaff: start a shared serials string file

Also ensure that the pattern template editor uses it,
as a previous commit ended up breaking it by adding uses of
strings to the core serials service.

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../templates/staff/admin/serials/pattern_template.tt2   |  1 +
 Open-ILS/src/templates/staff/cat/catalog/index.tt2       | 11 +----------
 Open-ILS/src/templates/staff/serials/index.tt2           | 11 +----------
 .../templates/staff/serials/share/serials_strings.tt2    | 16 ++++++++++++++++
 4 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 Open-ILS/src/templates/staff/serials/share/serials_strings.tt2

diff --git a/Open-ILS/src/templates/staff/admin/serials/pattern_template.tt2 b/Open-ILS/src/templates/staff/admin/serials/pattern_template.tt2
index aab2258722..6746e8ae71 100644
--- a/Open-ILS/src/templates/staff/admin/serials/pattern_template.tt2
+++ b/Open-ILS/src/templates/staff/admin/serials/pattern_template.tt2
@@ -10,6 +10,7 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/fm_record_editor.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/ui.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/serials/app.js"></script>
+[% INCLUDE 'staff/serials/share/serials_strings.tt2' %]
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/serials/services/core.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/serials/directives/prediction_wizard.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/admin/serials/pattern_template.js"></script>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 b/Open-ILS/src/templates/staff/cat/catalog/index.tt2
index afaef9f9b6..f5178795b2 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/index.tt2
@@ -10,6 +10,7 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/eframe.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/record.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/tagtable.js"></script>
+[% INCLUDE 'staff/serials/share/serials_strings.tt2' %]
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/serials/services/core.js"></script>
 [% INCLUDE 'staff/cat/share/marcedit_strings.tt2' %]
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/marcedit.js"></script>
@@ -56,16 +57,6 @@
     s.SERIALS_ISSUANCE_FAIL_SAVE = "[% l('Failed to save issuance') %]";
     s.SERIALS_ISSUANCE_SUCCESS_SAVE = "[% l('Issuance saved') %]";
 
-    s.SERIALS_ITEM_STATUS = {};
-    s.SERIALS_ITEM_STATUS.Expected = "[% l('Expected') %]";
-    s.SERIALS_ITEM_STATUS.Received = "[% l('Received') %]";
-    s.SERIALS_ITEM_STATUS.Claimed = "[% l('Claimed') %]";
-    s.SERIALS_ITEM_STATUS.Bindery = "[% l('Bindery') %]";
-    s.SERIALS_ITEM_STATUS.Bound = "[% l('Bound') %]";
-    s.SERIALS_ITEM_STATUS.Discarded = "[% l('Discarded') %]";
-    s.SERIALS_ITEM_STATUS['Not Held'] = "[% l('Not Held' ) %]";
-    s.SERIALS_ITEM_STATUS['Not Published'] = "[% l('Not Published') %]";
-
   }])
 </script>
 
diff --git a/Open-ILS/src/templates/staff/serials/index.tt2 b/Open-ILS/src/templates/staff/serials/index.tt2
index 9fe96b6b3e..0696cc39f8 100644
--- a/Open-ILS/src/templates/staff/serials/index.tt2
+++ b/Open-ILS/src/templates/staff/serials/index.tt2
@@ -8,6 +8,7 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/grid.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/eframe.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/mfhd.js"></script>
+[% INCLUDE 'staff/serials/share/serials_strings.tt2' %]
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/serials/services/core.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/serials/app.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/marcrecord.js"></script>
@@ -58,16 +59,6 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
     s.CONFIRM_CHANGE_ITEMS.receive = "[% l('Receive selected items?') %]"
     s.CONFIRM_CHANGE_ITEMS_MESSAGE.receive = "[% l('Will receive {{items}} item(s) without barcoding.') %]";
 
-    s.SERIALS_ITEM_STATUS = {};
-    s.SERIALS_ITEM_STATUS.Expected = "[% l('Expected') %]";
-    s.SERIALS_ITEM_STATUS.Received = "[% l('Received') %]";
-    s.SERIALS_ITEM_STATUS.Claimed = "[% l('Claimed') %]";
-    s.SERIALS_ITEM_STATUS.Bindery = "[% l('Bindery') %]";
-    s.SERIALS_ITEM_STATUS.Bound = "[% l('Bound') %]";
-    s.SERIALS_ITEM_STATUS.Discarded = "[% l('Discarded') %]";
-    s.SERIALS_ITEM_STATUS['Not Held'] = "[% l('Not Held' ) %]";
-    s.SERIALS_ITEM_STATUS['Not Published'] = "[% l('Not Published') %]";
-
     s.CONFIRM_DELETE_MFHDS = "[% l('Delete selected MFHD(s)?') %]";
     s.CONFIRM_DELETE_MFHDS_MESSAGE = "[% l('Will delete {{items}} MFHD(s).') %]";
 }]);
diff --git a/Open-ILS/src/templates/staff/serials/share/serials_strings.tt2 b/Open-ILS/src/templates/staff/serials/share/serials_strings.tt2
new file mode 100644
index 0000000000..f773fa1434
--- /dev/null
+++ b/Open-ILS/src/templates/staff/serials/share/serials_strings.tt2
@@ -0,0 +1,16 @@
+[%# Shared serial strings %]
+
+<script>
+angular.module('egCoreMod').run(['egStrings', function(s) {
+    s.SERIALS_ITEM_STATUS = {};
+    s.SERIALS_ITEM_STATUS.Expected = "[% l('Expected') %]";
+    s.SERIALS_ITEM_STATUS.Received = "[% l('Received') %]";
+    s.SERIALS_ITEM_STATUS.Claimed = "[% l('Claimed') %]";
+    s.SERIALS_ITEM_STATUS.Bindery = "[% l('Bindery') %]";
+    s.SERIALS_ITEM_STATUS.Bound = "[% l('Bound') %]";
+    s.SERIALS_ITEM_STATUS.Discarded = "[% l('Discarded') %]";
+    s.SERIALS_ITEM_STATUS['Not Held'] = "[% l('Not Held' ) %]";
+    s.SERIALS_ITEM_STATUS['Not Published'] = "[% l('Not Published') %]";
+}]);
+</script>
+
-- 
2.11.0