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>
Signed-off-by: Ruth Frasur <rfrasur@library.in.gov>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

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 1396a8d..46d9b39 100644 (file)
--- 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 791ba23..0bd33a3 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -21799,6 +21799,15 @@ VALUES (
     oils_i18n_gettext(
         'eg.grid.acq.funding_source.credit',
         'Grid Config: eg.grid.acq.funding_source.credit',
+    )
+);
+
+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 cbac2a5..741288a 100644 (file)
--- 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;