From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 31 Jul 2018 20:52:18 +0000 (-0400)
Subject: LP#1750894 Additional workstation setting types + repairs
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=73b7ace22996370f5bc8e338f115a3d9dd03b349;p=Evergreen.git

LP#1750894 Additional workstation setting types + repairs

Added new workstation setting types:

circ.checkout.strict_barcode
cat.holdings_show_empty_org
cat.copy.defaults
cat.printlabels.default_template
cat.printlabels.templates

Bump perm ID in seed data, take 2.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---

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 2aba1bada1..c2eb7f6809 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1906,8 +1906,8 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
     'Delete copy alerts', 'ppl', 'description' )),
  ( 607, 'EMERGENCY_CLOSING', oils_i18n_gettext( 607,
     'Create and manage Emergency Closings', 'ppl', 'description' )),
- (607, 'APPLY_WORKSTATION_SETTING',
-   oils_i18n_gettext(607, 'APPLY_WORKSTATION_SETTING', 'ppl', 'description'))
+ (608, 'APPLY_WORKSTATION_SETTING',
+   oils_i18n_gettext(608, 'APPLY_WORKSTATION_SETTING', 'ppl', 'description'))
 ;
 
 
@@ -18426,6 +18426,13 @@ VALUES (
         'cwst', 'label'
     )
 ), (
+    'circ.checkout.strict_barcode', 'circ', 'bool',
+    oils_i18n_gettext(
+        'circ.checkout.strict_barcode',
+        'Checkout: Strict Barcode',
+        'cwst', 'label'
+    )
+), (
     'cat.holdings_show_copies', 'cat', 'bool',
     oils_i18n_gettext(
         'cat.holdings_show_copies',
@@ -18440,6 +18447,13 @@ VALUES (
         'cwst', 'label'
     )
 ), (
+    'cat.holdings_show_empty_org', 'cat', 'bool',
+    oils_i18n_gettext(
+        'cat.holdings_show_empty_org',
+        'Holdings View Show Empty Orgs',
+        'cwst', 'label'
+    )
+), (
     'cat.holdings_show_vols', 'cat', 'bool',
     oils_i18n_gettext(
         'cat.holdings_show_vols',
@@ -18447,6 +18461,27 @@ VALUES (
         'cwst', 'label'
     )
 ), (
+    'cat.copy.defaults', 'cat', 'object',
+    oils_i18n_gettext(
+        'cat.copy.defaults',
+        'Copy Edit Default Values',
+        'cwst', 'label'
+    )
+), (
+    'cat.printlabels.default_template', 'cat', 'string',
+    oils_i18n_gettext(
+        'cat.printlabels.default_template',
+        'Print Label Default Template',
+        'cwst', 'label'
+    )
+), (
+    'cat.printlabels.templates', 'cat', 'object',
+    oils_i18n_gettext(
+        'cat.printlabels.templates',
+        'Print Label Templates',
+        'cwst', 'label'
+    )
+), (
     'eg.circ.patron.search.include_inactive', 'circ', 'bool',
     oils_i18n_gettext(
         'eg.circ.patron.search.include_inactive',
diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.workstation-settings.sql b/Open-ILS/src/sql/Pg/upgrade/YYYY.data.workstation-settings.sql
index 12046cd6d0..ba841cd516 100644
--- a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.workstation-settings.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/YYYY.data.workstation-settings.sql
@@ -97,6 +97,13 @@ VALUES (
         'cwst', 'label'
     )
 ), (
+    'circ.checkout.strict_barcode', 'circ', 'bool',
+    oils_i18n_gettext(
+        'circ.checkout.strict_barcode',
+        'Checkout: Strict Barcode',
+        'cwst', 'label'
+    )
+), (
     'cat.holdings_show_copies', 'cat', 'bool',
     oils_i18n_gettext(
         'cat.holdings_show_copies',
@@ -111,6 +118,13 @@ VALUES (
         'cwst', 'label'
     )
 ), (
+    'cat.holdings_show_empty_org', 'cat', 'bool',
+    oils_i18n_gettext(
+        'cat.holdings_show_empty_org',
+        'Holdings View Show Empty Orgs',
+        'cwst', 'label'
+    )
+), (
     'cat.holdings_show_vols', 'cat', 'bool',
     oils_i18n_gettext(
         'cat.holdings_show_vols',
@@ -118,6 +132,27 @@ VALUES (
         'cwst', 'label'
     )
 ), (
+    'cat.copy.defaults', 'cat', 'object',
+    oils_i18n_gettext(
+        'cat.copy.defaults',
+        'Copy Edit Default Values',
+        'cwst', 'label'
+    )
+), (
+    'cat.printlabels.default_template', 'cat', 'string',
+    oils_i18n_gettext(
+        'cat.printlabels.default_template',
+        'Print Label Default Template',
+        'cwst', 'label'
+    )
+), (
+    'cat.printlabels.templates', 'cat', 'object',
+    oils_i18n_gettext(
+        'cat.printlabels.templates',
+        'Print Label Templates',
+        'cwst', 'label'
+    )
+), (
     'eg.circ.patron.search.include_inactive', 'circ', 'bool',
     oils_i18n_gettext(
         'eg.circ.patron.search.include_inactive',