From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 9 Feb 2021 16:33:33 +0000 (-0500)
Subject: LP1888723 Use existing user setting for copy templates
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7831e40a2cc3f1dab2d6781a49ce7d8252803a28;p=working%2FEvergreen.git

LP1888723 Use existing user setting for copy templates

Also propagate the new 'defaults' workstation setting to the seed data
file.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts
index 1396a8d346..46d9b39dc7 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts
@@ -87,7 +87,7 @@ export class VolCopyService {
 
         // These will come up later -- prefetch.
         .then(_ => this.serverStore.getItemBatch([
-            'cat.copy.templates',
+            'webstaff.cat.copy.templates',
             'eg.cat.volcopy.defaults',
             'eg.cat.record.summary.collapse'
         ]))
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 4f2948e957..762b09f96c 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -21260,3 +21260,14 @@ VALUES (
         'cgf', 'label'
     )
 );
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+    'eg.cat.volcopy.defaults', 'cat', 'object',
+    oils_i18n_gettext(
+        'eg.cat.volcopy.defaults',
+        'Holdings Editor Default Values and Visibility',
+        'cwst', 'label'
+    )
+);
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.volcopy-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.volcopy-settings.sql
index cbac2a5503..741288aad8 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.volcopy-settings.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.volcopy-settings.sql
@@ -1,3 +1,6 @@
+BEGIN;
+
+--SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version);
 
 INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
 VALUES (
@@ -7,13 +10,6 @@ VALUES (
         'Holdings Editor Default Values and Visibility',
         'cwst', 'label'
     )
-), (
-    'cat.copy.templates', 'cat', 'object',
-    oils_i18n_gettext(
-        'cat.copy.templates',
-        'Holdings Editor Copy Templates',
-        'cwst', 'label'
-    )
 );
 
-
+COMMIT;