LP#1855780: add grid config settings

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html
index 6aaa890..92fddbb 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/trigger-edit.component.html
@@ -30,7 +30,7 @@
         <ng-template ngbNavContent>
             <h3 class="mb-3">Trigger Event Environment</h3>
             <eg-grid #envGrid idlClass="atenv" [dataSource]="envDataSource" 
-                showFields="path,collector,label"
+                showFields="path,collector,label" persistKey="admin.local.triggers.atenv"
                 (onRowActivate)="editSelected([$event])">
                 <eg-grid-toolbar-button label="New Environment" i18n-label
                     [action]="createNewEnv"></eg-grid-toolbar-button>
@@ -48,6 +48,7 @@
         <ng-template ngbNavContent>
             <h3 class="mb-3">Trigger Event Parameters</h3>
             <eg-grid #paramGrid idlClass="atevparam" [dataSource]="paramDataSource" 
+                persistKey="admin.local.triggers.atevparam"
                 showFields="param,value" (onRowActivate)="editSelected([$event])">
                 <eg-grid-toolbar-button label="New Parameter" i18n-label
                     [action]="createNewParam"></eg-grid-toolbar-button>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/triggers.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/triggers.component.html
index cb6a701..830f8aa 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/triggers.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/triggers/triggers.component.html
@@ -25,7 +25,7 @@
         <h4 class="mb-3 mt-3">Trigger Event Definitions</h4>
         <eg-grid #eventsGrid idlClass="atevdef" [dataSource]="eventsDataSource" 
             showFields="owner,name,hook,active,delay,delay_field,group_field,reactor,validator,repeat_delay,granularity,retention_interval"
-            [showLinkSelectors]="true" [sortable]="true" [stickyHeader]="true"
+            [showLinkSelectors]="true" [sortable]="true" [stickyHeader]="true" persistKey="admin.local.triggers.atevdef"
             (onRowActivate)="editSelected([$event])" [filterable]="true">
             <eg-grid-toolbar-button label="New Event Definition" i18n-label
                 [action]="createNewEvent"></eg-grid-toolbar-button>

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 6033ace..58f4a18 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -22025,3 +22025,27 @@ INSERT INTO config.org_unit_setting_type (
     ),
     'bool'
 );
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+    'eg.grid.admin.local.triggers.atevdef', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.local.triggers.atevdef',
+        'Grid Config: eg.grid.admin.local.triggers.atevdef',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.local.triggers.atenv', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.local.triggers.atenv',
+        'Grid Config: eg.grid.admin.local.triggers.atenv',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.local.triggers.atevparam', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.local.triggers.atevparam',
+        'Grid Config: eg.grid.admin.local.triggers.atevparam',
+        'cwst', 'label'
+    )
+);

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.trigger_ui_grid_settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.trigger_ui_grid_settings.sql
new file mode 100644 (file)
index 0000000..757fd14
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.trigger_ui_grid_settings.sql
@@ -0,0 +1,29 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+    'eg.grid.admin.local.triggers.atevdef', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.local.triggers.atevdef',
+        'Grid Config: eg.grid.admin.local.triggers.atevdef',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.local.triggers.atenv', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.local.triggers.atenv',
+        'Grid Config: eg.grid.admin.local.triggers.atenv',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.local.triggers.atevparam', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.local.triggers.atevparam',
+        'Grid Config: eg.grid.admin.local.triggers.atevparam',
+        'cwst', 'label'
+    )
+);
+
+COMMIT;