[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8f5fe0722161f767ffa4a73e1add8d4216b06195
Evergreen Git
git at git.evergreen-ils.org
Wed Feb 13 12:01:04 EST 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 8f5fe0722161f767ffa4a73e1add8d4216b06195 (commit)
via 4a95d2a5d56a017b986805ef0dc9016f5958e8ab (commit)
via 092dd5188780637dafb6db73c5163fddc8c1090b (commit)
from 6ae2427affb3e6cb8c5f96b2a21530efd6798a70 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8f5fe0722161f767ffa4a73e1add8d4216b06195
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Feb 13 12:00:27 2019 -0500
Stamping upgrade script
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index ad8335b..4f5da68 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1146', :eg_version); -- jeffdavis/csharp
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1147', :eg_version); -- berick/miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.server-admin-grid-settings.sql b/Open-ILS/src/sql/Pg/upgrade/1147.data.server-admin-grid-settings.sql
similarity index 99%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.server-admin-grid-settings.sql
rename to Open-ILS/src/sql/Pg/upgrade/1147.data.server-admin-grid-settings.sql
index e704df9..f204c81 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.server-admin-grid-settings.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1147.data.server-admin-grid-settings.sql
@@ -1,6 +1,6 @@
BEGIN;
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1147', :eg_version);
INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
VALUES (
commit 4a95d2a5d56a017b986805ef0dc9016f5958e8ab
Author: Bill Erickson <berickxx at gmail.com>
Date: Thu Jan 24 11:37:51 2019 -0500
LP1811156 Angular server admin grid settings
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
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 1fe0bb6..190e1c0 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -19494,6 +19494,256 @@ VALUES (
);
+-- server admin workstation settings
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+ 'eg.grid.admin.server.config.rule_age_hold_protect', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.rule_age_hold_protect',
+ 'Grid Config: admin.server.config.rule_age_hold_protect',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.asset.stat_cat_sip_fields', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.asset.stat_cat_sip_fields',
+ 'Grid Config: admin.server.asset.stat_cat_sip_fields',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.actor.stat_cat_sip_fields', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.actor.stat_cat_sip_fields',
+ 'Grid Config: admin.server.actor.stat_cat_sip_fields',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.authority.browse_axis', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.authority.browse_axis',
+ 'Grid Config: admin.server.authority.browse_axis',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.authority.control_set', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.authority.control_set',
+ 'Grid Config: admin.server.authority.control_set',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.authority.heading_field', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.authority.heading_field',
+ 'Grid Config: admin.server.authority.heading_field',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.authority.thesaurus', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.authority.thesaurus',
+ 'Grid Config: admin.server.authority.thesaurus',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.best_hold_order', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.best_hold_order',
+ 'Grid Config: admin.server.config.best_hold_order',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.billing_type', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.billing_type',
+ 'Grid Config: admin.server.config.billing_type',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.asset.call_number_prefix', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.asset.call_number_prefix',
+ 'Grid Config: admin.server.asset.call_number_prefix',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.asset.call_number_suffix', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.asset.call_number_suffix',
+ 'Grid Config: admin.server.asset.call_number_suffix',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.rule_circ_duration', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.rule_circ_duration',
+ 'Grid Config: admin.server.config.rule_circ_duration',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.circ_limit_group', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.circ_limit_group',
+ 'Grid Config: admin.server.config.circ_limit_group',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.circ_matrix_weights', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.circ_matrix_weights',
+ 'Grid Config: admin.server.config.circ_matrix_weights',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.rule_max_fine', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.rule_max_fine',
+ 'Grid Config: admin.server.config.rule_max_fine',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.circ_modifier', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.circ_modifier',
+ 'Grid Config: admin.server.config.circ_modifier',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.copy_status', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.copy_status',
+ 'Grid Config: admin.server.config.copy_status',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.floating_group', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.floating_group',
+ 'Grid Config: admin.server.config.floating_group',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.global_flag', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.global_flag',
+ 'Grid Config: admin.server.config.global_flag',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.hard_due_date', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.hard_due_date',
+ 'Grid Config: admin.server.config.hard_due_date',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.hold_matrix_weights', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.hold_matrix_weights',
+ 'Grid Config: admin.server.config.hold_matrix_weights',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.vandelay.match_set', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.vandelay.match_set',
+ 'Grid Config: admin.server.vandelay.match_set',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.coded_value_map', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.coded_value_map',
+ 'Grid Config: admin.server.config.coded_value_map',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.vandelay.import_bib_trash_group', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.vandelay.import_bib_trash_group',
+ 'Grid Config: admin.server.vandelay.import_bib_trash_group',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.record_attr_definition', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.record_attr_definition',
+ 'Grid Config: admin.server.config.record_attr_definition',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.metabib_class', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.metabib_class',
+ 'Grid Config: admin.server.config.metabib_class',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.metabib_field_ts_map', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.metabib_field_ts_map',
+ 'Grid Config: admin.server.config.metabib_field_ts_map',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.metabib_field', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.metabib_field',
+ 'Grid Config: admin.server.config.metabib_field',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.permission.perm_list', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.permission.perm_list',
+ 'Grid Config: admin.server.permission.perm_list',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.remote_account', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.remote_account',
+ 'Grid Config: admin.server.config.remote_account',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.sms_carrier', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.sms_carrier',
+ 'Grid Config: admin.server.config.sms_carrier',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.usr_activity_type', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.usr_activity_type',
+ 'Grid Config: admin.server.config.usr_activity_type',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.weight_assoc', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.weight_assoc',
+ 'Grid Config: admin.server.config.weight_assoc',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.z3950_index_field_map', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.z3950_index_field_map',
+ 'Grid Config: admin.server.config.z3950_index_field_map',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.z3950_source', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.z3950_source',
+ 'Grid Config: admin.server.config.z3950_source',
+ 'cwst', 'label'
+ )
+);
+
+
INSERT INTO config.org_unit_setting_type
(name, label, description, grp, datatype)
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.server-admin-grid-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.server-admin-grid-settings.sql
new file mode 100644
index 0000000..e704df9
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.server-admin-grid-settings.sql
@@ -0,0 +1,254 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+ 'eg.grid.admin.server.config.rule_age_hold_protect', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.rule_age_hold_protect',
+ 'Grid Config: admin.server.config.rule_age_hold_protect',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.asset.stat_cat_sip_fields', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.asset.stat_cat_sip_fields',
+ 'Grid Config: admin.server.asset.stat_cat_sip_fields',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.actor.stat_cat_sip_fields', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.actor.stat_cat_sip_fields',
+ 'Grid Config: admin.server.actor.stat_cat_sip_fields',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.authority.browse_axis', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.authority.browse_axis',
+ 'Grid Config: admin.server.authority.browse_axis',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.authority.control_set', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.authority.control_set',
+ 'Grid Config: admin.server.authority.control_set',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.authority.heading_field', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.authority.heading_field',
+ 'Grid Config: admin.server.authority.heading_field',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.authority.thesaurus', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.authority.thesaurus',
+ 'Grid Config: admin.server.authority.thesaurus',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.best_hold_order', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.best_hold_order',
+ 'Grid Config: admin.server.config.best_hold_order',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.billing_type', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.billing_type',
+ 'Grid Config: admin.server.config.billing_type',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.asset.call_number_prefix', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.asset.call_number_prefix',
+ 'Grid Config: admin.server.asset.call_number_prefix',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.asset.call_number_suffix', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.asset.call_number_suffix',
+ 'Grid Config: admin.server.asset.call_number_suffix',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.rule_circ_duration', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.rule_circ_duration',
+ 'Grid Config: admin.server.config.rule_circ_duration',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.circ_limit_group', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.circ_limit_group',
+ 'Grid Config: admin.server.config.circ_limit_group',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.circ_matrix_weights', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.circ_matrix_weights',
+ 'Grid Config: admin.server.config.circ_matrix_weights',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.rule_max_fine', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.rule_max_fine',
+ 'Grid Config: admin.server.config.rule_max_fine',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.circ_modifier', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.circ_modifier',
+ 'Grid Config: admin.server.config.circ_modifier',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.copy_status', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.copy_status',
+ 'Grid Config: admin.server.config.copy_status',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.floating_group', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.floating_group',
+ 'Grid Config: admin.server.config.floating_group',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.global_flag', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.global_flag',
+ 'Grid Config: admin.server.config.global_flag',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.hard_due_date', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.hard_due_date',
+ 'Grid Config: admin.server.config.hard_due_date',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.hold_matrix_weights', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.hold_matrix_weights',
+ 'Grid Config: admin.server.config.hold_matrix_weights',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.vandelay.match_set', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.vandelay.match_set',
+ 'Grid Config: admin.server.vandelay.match_set',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.coded_value_map', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.coded_value_map',
+ 'Grid Config: admin.server.config.coded_value_map',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.vandelay.import_bib_trash_group', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.vandelay.import_bib_trash_group',
+ 'Grid Config: admin.server.vandelay.import_bib_trash_group',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.record_attr_definition', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.record_attr_definition',
+ 'Grid Config: admin.server.config.record_attr_definition',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.metabib_class', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.metabib_class',
+ 'Grid Config: admin.server.config.metabib_class',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.metabib_field_ts_map', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.metabib_field_ts_map',
+ 'Grid Config: admin.server.config.metabib_field_ts_map',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.metabib_field', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.metabib_field',
+ 'Grid Config: admin.server.config.metabib_field',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.permission.perm_list', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.permission.perm_list',
+ 'Grid Config: admin.server.permission.perm_list',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.remote_account', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.remote_account',
+ 'Grid Config: admin.server.config.remote_account',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.sms_carrier', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.sms_carrier',
+ 'Grid Config: admin.server.config.sms_carrier',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.usr_activity_type', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.usr_activity_type',
+ 'Grid Config: admin.server.config.usr_activity_type',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.weight_assoc', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.weight_assoc',
+ 'Grid Config: admin.server.config.weight_assoc',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.z3950_index_field_map', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.z3950_index_field_map',
+ 'Grid Config: admin.server.config.z3950_index_field_map',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.server.config.z3950_source', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.server.config.z3950_source',
+ 'Grid Config: admin.server.config.z3950_source',
+ 'cwst', 'label'
+ )
+);
+
+COMMIT;
+
commit 092dd5188780637dafb6db73c5163fddc8c1090b
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Jan 9 17:13:43 2019 -0500
LP1811156 Activate Angular server admin page
Point Admin -> Server Admin from AngJS and Angular navbars to the
Angular version of the server admin splash page.
Includes Angular auto-admin page sanity check for cases where a route
has no extra data.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts
index 84219f1..d47d92a 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts
@@ -55,7 +55,9 @@ export class BasicAdminPageComponent implements OnInit {
}
// Pass the readonlyFields param if available
- if (this.route.snapshot.data[0].readonlyFields) {
+ if (this.route.snapshot.data &&
+ this.route.snapshot.data.length &&
+ this.route.snapshot.data[0].readonlyFields) {
this.readonlyFields = this.route.snapshot.data[0].readonlyFields;
}
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index 7c30c00..b43d8e7 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -336,17 +336,11 @@
<span class="material-icons">person</span>
<span i18n>User Permission Editor</span>
</a>
- <!-- Angular version
<a class="dropdown-item"
routerLink="/staff/admin/server/splash">
<span class="material-icons">account_balance</span>
<span i18n>Server Administration</span>
</a>
- -->
- <a class="dropdown-item" href="/eg/staff/admin/server/index">
- <span class="material-icons">account_balance</span>
- <span i18n>Server Administration</span>
- </a>
<a class="dropdown-item" href="/eg/staff/admin/local/index">
<span class="material-icons">landscape</span>
<span i18n>Local Administration</span>
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 1ca59d5..ee48e6b 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -484,7 +484,7 @@
</a>
</li>
<li>
- <a href="./admin/server/index" target="_self">
+ <a href="/eg2/staff/admin/server/splash">
<span class="glyphicon glyphicon-briefcase"></span>
[% l('Server Administration') %]
</a>
-----------------------------------------------------------------------
Summary of changes:
.../app/staff/admin/basic-admin-page.component.ts | 4 +-
Open-ILS/src/eg2/src/app/staff/nav.component.html | 6 -
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 250 ++++++++++++++++++++
.../1147.data.server-admin-grid-settings.sql | 254 +++++++++++++++++++++
Open-ILS/src/templates/staff/navbar.tt2 | 2 +-
6 files changed, 509 insertions(+), 9 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1147.data.server-admin-grid-settings.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list