[open-ils-commits] [GIT] Evergreen ILS branch master updated. fef4db262121c4c08ab6c570bd938d473fff9722
Evergreen Git
git at git.evergreen-ils.org
Mon Aug 5 21:01:23 EDT 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 fef4db262121c4c08ab6c570bd938d473fff9722 (commit)
via c650b6ce21d6ec6b6b44ebbb82e3dc1db937566f (commit)
via fd8777b3c21386ea6f90d1474a6260ebf9330f55 (commit)
via 9cb7a6b2000c4691f67012da339b19c14d3ef56d (commit)
via 86459ec3c036d2765898bea4ed36c0ade8b08c73 (commit)
via b824b45b0f56f05740dac55fd62e57522cfebf07 (commit)
via fe1ff53dba6dffc9fdcbf5665128553e265e5e6b (commit)
from 17948e4788293386ac14b8097df495c034f0a42b (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 fef4db262121c4c08ab6c570bd938d473fff9722
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Mon Aug 5 20:58:34 2019 -0400
LP#1837059: stamp DB update
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 894f540d46..80581d11d8 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 ('1171', :eg_version); -- rhamby/mstroup/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1172', :eg_version); -- berick/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.local-admin-settings.sql b/Open-ILS/src/sql/Pg/upgrade/1172.data.local-admin-settings.sql
similarity index 96%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.local-admin-settings.sql
rename to Open-ILS/src/sql/Pg/upgrade/1172.data.local-admin-settings.sql
index 2b2123e723..152e7d913e 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.local-admin-settings.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1172.data.local-admin-settings.sql
@@ -1,6 +1,6 @@
BEGIN;
--- SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1172', :eg_version);
INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
VALUES (
commit c650b6ce21d6ec6b6b44ebbb82e3dc1db937566f
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Thu Aug 1 11:24:34 2019 -0400
LP#1837059: (follow-up) add release notes
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/docs/RELEASE_NOTES_NEXT/Client/angular-local-admin-page.adoc b/docs/RELEASE_NOTES_NEXT/Client/angular-local-admin-page.adoc
new file mode 100644
index 0000000000..bb05996c76
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Client/angular-local-admin-page.adoc
@@ -0,0 +1,15 @@
+Port Local Administration Page to Angular
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The Administration => Local Administration page has been migrated
+to Angular along with the following specific Local Administration
+interfaces:
+
+ * Address Alerts
+ * Barcode Completion
+ * Group Penalty Thresholds
+ * Hold Policies
+ * Item Alert Suppression
+ * Item Tags
+ * Non-Cataloged Types Editor
+ * Shelving Location Editor
+ * Statistical Popularity Badges
commit fd8777b3c21386ea6f90d1474a6260ebf9330f55
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Thu Aug 1 11:17:19 2019 -0400
LP#1837059: (follow-up) mark help text for i18n
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html
index 892a465375..6d5f0cb1dd 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html
@@ -1,5 +1,5 @@
-<ng-template #helpTemplate>
+<ng-template i18n #helpTemplate>
<ul>
<li>Address Alert fields support regular expressions and are case-insensitive by default.</li>
<li>Example wildcard match: 742 Evergr.*n Terrace</li>
commit 9cb7a6b2000c4691f67012da339b19c14d3ef56d
Author: Bill Erickson <berickxx at gmail.com>
Date: Thu Aug 1 10:36:06 2019 -0400
LP1837059 Address alert config help text
Support passing a helpTemplate value to the staff admin page builder.
Create an Address Alert component so it may define and pass its own help
text to the admin page builder.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html
new file mode 100644
index 0000000000..892a465375
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html
@@ -0,0 +1,17 @@
+
+<ng-template #helpTemplate>
+ <ul>
+ <li>Address Alert fields support regular expressions and are case-insensitive by default.</li>
+ <li>Example wildcard match: 742 Evergr.*n Terrace</li>
+ <li>Example case-sensitive match: (?c)742 Evergr.*n Terrace</li>
+ <li>If the billing or mailing address fields are selected, the
+ tested address must be a billing or mailing address to match.</li>
+ </ul>
+</ng-template>
+
+<eg-title i18n-prefix prefix="Address Alert Administration"></eg-title>
+<eg-staff-banner bannerText="Address Alert Configuration" i18n-bannerText>
+</eg-staff-banner>
+<eg-admin-page persistKeyPfx="local" idlClass="aal"
+ [helpTemplate]="helpTemplate"></eg-admin-page>
+
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.ts
new file mode 100644
index 0000000000..56d37d3686
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.ts
@@ -0,0 +1,13 @@
+import {Component, OnInit, ViewChild, TemplateRef} from '@angular/core';
+
+ at Component({
+ templateUrl: './address-alert.component.html'
+})
+
+export class AddressAlertComponent {
+
+ @ViewChild('helpTemplate') helpTemplate: TemplateRef<any>;
+
+ constructor() {}
+}
+
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts
index a18d3e6de6..c2b5041962 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts
@@ -4,10 +4,12 @@ import {StaffCommonModule} from '@eg/staff/common.module';
import {AdminLocalRoutingModule} from './routing.module';
import {AdminCommonModule} from '@eg/staff/admin/common.module';
import {AdminLocalSplashComponent} from './admin-local-splash.component';
+import {AddressAlertComponent} from './address-alert.component';
@NgModule({
declarations: [
- AdminLocalSplashComponent
+ AdminLocalSplashComponent,
+ AddressAlertComponent
],
imports: [
AdminCommonModule,
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
index c46dec9431..12030dde0f 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
@@ -2,6 +2,7 @@ import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {AdminLocalSplashComponent} from './admin-local-splash.component';
import {BasicAdminPageComponent} from '@eg/staff/admin/basic-admin-page.component';
+import {AddressAlertComponent} from './address-alert.component';
const routes: Routes = [{
path: 'splash',
@@ -11,6 +12,9 @@ const routes: Routes = [{
component: BasicAdminPageComponent,
data: [{schema: 'config', table: 'hold_matrix_matchpoint', disableOrgFilter: true}]
}, {
+ path: 'actor/address_alert',
+ component: AddressAlertComponent
+}, {
path: ':schema/:table',
component: BasicAdminPageComponent
}];
diff --git a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html
index ab6c263249..a69dabd001 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html
@@ -24,6 +24,10 @@
<!-- idlObject and fieldName applied programmatically -->
<eg-translate #translator></eg-translate>
+<ng-container *ngIf="helpTemplate">
+ <ng-container *ngTemplateOutlet="helpTemplate"></ng-container>
+</ng-container>
+
<eg-grid #grid idlClass="{{idlClass}}" [dataSource]="dataSource"
[sortable]="true" persistKey="{{persistKey}}" [showLinkSelectors]="true">
<eg-grid-toolbar-button [disabled]="!canCreate"
diff --git a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts
index 88f9525d7d..f920d7b3c2 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts
@@ -67,6 +67,10 @@ export class AdminPageComponent implements OnInit {
// Optional comma-separated list of read-only fields
@Input() readonlyFields: string;
+ // Optional template containing help/about text which will
+ // be added to the page, above the grid.
+ @Input() helpTemplate: TemplateRef<any>;
+
@ViewChild('grid') grid: GridComponent;
@ViewChild('editDialog') editDialog: FmRecordEditorComponent;
@ViewChild('successString') successString: StringComponent;
commit 86459ec3c036d2765898bea4ed36c0ade8b08c73
Author: Bill Erickson <berickxx at gmail.com>
Date: Thu Jul 18 10:45:45 2019 -0400
LP1837059 Local admin workstation settings
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.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 e8dc76a1fa..b04a650cf4 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -19971,6 +19971,7 @@ VALUES (
)
);
+
INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
VALUES (
'eg.catalog.search_templates', 'gui', 'object',
@@ -19981,3 +19982,62 @@ VALUES (
)
);
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+ 'eg.grid.admin.local.config.hold_matrix_matchpoint', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.config.hold_matrix_matchpoint',
+ 'Grid Config: admin.local.config.hold_matrix_matchpoint',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.actor.address_alert', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.actor.address_alert',
+ 'Grid Config: admin.local.actor.address_alert',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.config.barcode_completion', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.config.barcode_completion',
+ 'Grid Config: admin.local.config.barcode_completion',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.actor.copy_alert_suppress', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.actor.copy_alert_suppress',
+ 'Grid Config: admin.local.actor.copy_alert_suppress',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.asset.copy_location', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.asset.copy_location',
+ 'Grid Config: admin.local.asset.copy_location',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.asset.copy_tag', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.asset.copy_tag',
+ 'Grid Config: admin.local.asset.copy_tag',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.permission.grp_penalty_threshold', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.permission.grp_penalty_threshold',
+ 'Grid Config: admin.local.permission.grp_penalty_threshold',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.config.non_cataloged_type', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.config.non_cataloged_type',
+ 'Grid Config: admin.local.config.non_cataloged_type',
+ 'cwst', 'label'
+ )
+);
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.local-admin-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.local-admin-settings.sql
new file mode 100644
index 0000000000..2b2123e723
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.local-admin-settings.sql
@@ -0,0 +1,67 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version);
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+ 'eg.grid.admin.local.config.hold_matrix_matchpoint', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.config.hold_matrix_matchpoint',
+ 'Grid Config: admin.local.config.hold_matrix_matchpoint',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.actor.address_alert', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.actor.address_alert',
+ 'Grid Config: admin.local.actor.address_alert',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.config.barcode_completion', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.config.barcode_completion',
+ 'Grid Config: admin.local.config.barcode_completion',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.actor.copy_alert_suppress', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.actor.copy_alert_suppress',
+ 'Grid Config: admin.local.actor.copy_alert_suppress',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.asset.copy_location', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.asset.copy_location',
+ 'Grid Config: admin.local.asset.copy_location',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.asset.copy_tag', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.asset.copy_tag',
+ 'Grid Config: admin.local.asset.copy_tag',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.permission.grp_penalty_threshold', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.permission.grp_penalty_threshold',
+ 'Grid Config: admin.local.permission.grp_penalty_threshold',
+ 'cwst', 'label'
+ )
+), (
+ 'eg.grid.admin.local.config.non_cataloged_type', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.admin.local.config.non_cataloged_type',
+ 'Grid Config: admin.local.config.non_cataloged_type',
+ 'cwst', 'label'
+ )
+);
+
+-- eg.grid.admin.local.rating.badge already exists
+
+COMMIT;
+
commit b824b45b0f56f05740dac55fd62e57522cfebf07
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Jul 17 18:03:31 2019 -0400
LP1837059 Angular local admin page
Links to the following pages now refer to their auto-generated Angular
equivalent:
actor/address_alert
config/barcode_completion
actor/copy_alert_suppress
asset/copy_location
asset/copy_tag
permission/grp_penalty_threshold
config/hold_matrix_matchpoint
config/non_cataloged_type
rating/badge
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
new file mode 100644
index 0000000000..edbb68f7ed
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
@@ -0,0 +1,69 @@
+<eg-staff-banner bannerText="Local Administration" i18n-bannerText>
+</eg-staff-banner>
+
+<div class="container">
+ <eg-link-table columnCount="3">
+ <eg-link-table-link i18n-label label="Address Alerts"
+ routerLink="/staff/admin/local/actor/address_alert"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Age Overdue Circulations to Lost"
+ url="/eg/staff/admin/local/circ/age_to_lost"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Auto-Print Settings"
+ url="/eg/staff/admin/local/config/auto_print"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Barcode Completion"
+ routerLink="/staff/admin/local/config/barcode_completion"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Cash Reports"
+ url="/eg/staff/admin/local/money/cash_reports"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Circulation Limit Sets"
+ url="/eg/staff/admin/local/config/circ_limit_set"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Circulation Policies"
+ url="/eg/staff/admin/local/config/circ_matrix_matchpoint"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Closed Dates Editor"
+ url="/eg/staff/admin/local/actor/closed_dates"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Item Alert Types"
+ url="/eg/staff/admin/local/config/copy_alert_types"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Item Alert Suppression"
+ routerLink="/staff/admin/local/actor/copy_alert_suppress"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Shelving Location Groups"
+ url="/eg/staff/admin/local/asset/copy_location_group"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Shelving Location Order"
+ url="/eg/staff/admin/local/asset/copy_location_order"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Shelving Locations Editor"
+ routerLink="/staff/admin/local/asset/copy_location"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Item Tags"
+ routerLink="/staff/admin/local/asset/copy_tag"></eg-link-table-link>
+ <!-- do-able with a list of IDL classes to add to the edit dialog -->
+ <eg-link-table-link i18n-label label="Field Documentation"
+ url="/eg/staff/admin/local/config/idl_field_doc"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Group Penalty Thresholds"
+ routerLink="/staff/admin/local/permission/grp_penalty_threshold"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Hold Policies"
+ routerLink="/staff/admin/local/config/hold_matrix_matchpoint"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Library Settings Editor"
+ url="/eg/staff/admin/local/asset/org_unit_settings"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Non-Cataloged Types Editor"
+ routerLink="/staff/admin/local/config/non_cataloged_type"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Notifications / Action Triggers"
+ url="/eg/staff/admin/local/action_trigger/event_definition"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Patrons with Negative Balances"
+ url="/eg/staff/admin/local/circ/neg_balance_users"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Permission Tree Display Entries"
+ url="/eg/staff/admin/local/permission/grp_tree_display_entry"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Search Filter Groups"
+ url="/eg/staff/admin/local/actor/search_filter_group"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Standing Penalties"
+ url="/eg/staff/admin/local/config/standing_penalty"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Statistical Categories Editor"
+ url="/eg/staff/admin/local/asset/stat_cat_editor"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Statistical Popularity Badges"
+ routerLink="/staff/admin/local/rating/badge"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Surveys"
+ url="/eg/staff/admin/local/action/survey"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Transit List"
+ url="/eg/staff/circ/transits/list"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Holdings Template Editor"
+ url="/eg/staff/cat/volcopy/edit_templates"></eg-link-table-link>
+ <eg-link-table-link i18n-label label="Work Log"
+ url="/eg/staff/admin/workstation/log"></eg-link-table-link>
+
+ </eg-link-table>
+</div>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.ts
new file mode 100644
index 0000000000..7f071741b1
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.ts
@@ -0,0 +1,10 @@
+import {Component} from '@angular/core';
+
+ at Component({
+ templateUrl: './admin-local-splash.component.html'
+})
+
+export class AdminLocalSplashComponent {
+}
+
+
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts
new file mode 100644
index 0000000000..a18d3e6de6
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts
@@ -0,0 +1,26 @@
+import {NgModule} from '@angular/core';
+import {TreeModule} from '@eg/share/tree/tree.module';
+import {StaffCommonModule} from '@eg/staff/common.module';
+import {AdminLocalRoutingModule} from './routing.module';
+import {AdminCommonModule} from '@eg/staff/admin/common.module';
+import {AdminLocalSplashComponent} from './admin-local-splash.component';
+
+ at NgModule({
+ declarations: [
+ AdminLocalSplashComponent
+ ],
+ imports: [
+ AdminCommonModule,
+ AdminLocalRoutingModule,
+ TreeModule
+ ],
+ exports: [
+ ],
+ providers: [
+ ]
+})
+
+export class AdminLocalModule {
+}
+
+
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
new file mode 100644
index 0000000000..c46dec9431
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
@@ -0,0 +1,23 @@
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
+import {AdminLocalSplashComponent} from './admin-local-splash.component';
+import {BasicAdminPageComponent} from '@eg/staff/admin/basic-admin-page.component';
+
+const routes: Routes = [{
+ path: 'splash',
+ component: AdminLocalSplashComponent
+}, {
+ path: 'config/hold_matrix_matchpoint',
+ component: BasicAdminPageComponent,
+ data: [{schema: 'config', table: 'hold_matrix_matchpoint', disableOrgFilter: true}]
+}, {
+ path: ':schema/:table',
+ component: BasicAdminPageComponent
+}];
+
+ at NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule]
+})
+
+export class AdminLocalRoutingModule {}
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/routing.module.ts
index 29df72cbf0..a0df70e070 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/routing.module.ts
@@ -10,6 +10,9 @@ const routes: Routes = [{
path: 'server',
loadChildren: '@eg/staff/admin/server/admin-server.module#AdminServerModule'
}, {
+ path: 'local',
+ loadChildren: '@eg/staff/admin/local/admin-local.module#AdminLocalModule'
+ }, {
path: 'acq',
loadChildren: '@eg/staff/admin/acq/admin-acq.module#AdminAcqModule'
}, {
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 99c1a27ff9..3595b3c9be 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -361,7 +361,7 @@
<span class="material-icons">account_balance</span>
<span i18n>Server Administration</span>
</a>
- <a class="dropdown-item" href="/eg/staff/admin/local/index">
+ <a class="dropdown-item" routerLink="/staff/admin/local/splash">
<span class="material-icons">landscape</span>
<span i18n>Local Administration</span>
</a>
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 0c325c759f..a9208c8d04 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -494,7 +494,7 @@
</a>
</li>
<li>
- <a href="./admin/local/index" target="_self">
+ <a href="/eg2/staff/admin/local/splash">
<span class="glyphicon glyphicon-picture"></span>
[% l('Local Administration') %]
</a>
commit fe1ff53dba6dffc9fdcbf5665128553e265e5e6b
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Jul 17 18:02:39 2019 -0400
LP1837059 Basic admin page can propagate disableOrgFilter
Allow admin pages to hide the automagic org unit filter by passing the
value in via the route.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
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 472245c892..ceed28792d 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
@@ -13,7 +13,8 @@ import {IdlService} from '@eg/core/idl.service';
<eg-staff-banner bannerText="{{classLabel}} Configuration" i18n-bannerText>
</eg-staff-banner>
<eg-admin-page persistKeyPfx="{{persistKeyPfx}}" idlClass="{{idlClass}}"
- readonlyFields="{{readonlyFields}}"></eg-admin-page>
+ readonlyFields="{{readonlyFields}}"
+ [disableOrgFilter]="disableOrgFilter"></eg-admin-page>
`
})
@@ -24,6 +25,9 @@ export class BasicAdminPageComponent implements OnInit {
persistKeyPfx: string;
readonlyFields = '';
+ // Tell the admin page to disable and hide the automagic org unit filter
+ disableOrgFilter: boolean;
+
constructor(
private route: ActivatedRoute,
private idl: IdlService
@@ -58,10 +62,17 @@ export class BasicAdminPageComponent implements OnInit {
}
// Pass the readonlyFields param if available
- if (this.route.snapshot.data &&
- this.route.snapshot.data[0] && // snapshot.data is a HASH.
- this.route.snapshot.data[0].readonlyFields) {
- this.readonlyFields = this.route.snapshot.data[0].readonlyFields;
+ if (this.route.snapshot.data && this.route.snapshot.data[0]) {
+ // snapshot.data is a HASH.
+ const data = this.route.snapshot.data[0];
+
+ if (data.readonlyFields) {
+ this.readonlyFields = data.readonlyFields;
+ }
+
+ if (data.disableOrgFilter) {
+ this.disableOrgFilter = true;
+ }
}
Object.keys(this.idl.classes).forEach(class_ => {
-----------------------------------------------------------------------
Summary of changes:
.../app/staff/admin/basic-admin-page.component.ts | 21 +++++--
.../staff/admin/local/address-alert.component.html | 17 ++++++
.../staff/admin/local/address-alert.component.ts | 13 ++++
.../admin/local/admin-local-splash.component.html | 69 ++++++++++++++++++++++
.../admin/local/admin-local-splash.component.ts | 10 ++++
.../admin-local.module.ts} | 14 ++---
.../src/app/staff/admin/local/routing.module.ts | 27 +++++++++
.../src/eg2/src/app/staff/admin/routing.module.ts | 3 +
Open-ILS/src/eg2/src/app/staff/nav.component.html | 2 +-
.../share/admin-page/admin-page.component.html | 4 ++
.../staff/share/admin-page/admin-page.component.ts | 4 ++
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 60 +++++++++++++++++++
.../Pg/upgrade/1172.data.local-admin-settings.sql | 67 +++++++++++++++++++++
Open-ILS/src/templates/staff/navbar.tt2 | 2 +-
.../Client/angular-local-admin-page.adoc | 15 +++++
16 files changed, 315 insertions(+), 15 deletions(-)
create mode 100644 Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html
create mode 100644 Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.ts
create mode 100644 Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
create mode 100644 Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.ts
copy Open-ILS/src/eg2/src/app/staff/admin/{server/admin-server.module.ts => local/admin-local.module.ts} (52%)
create mode 100644 Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1172.data.local-admin-settings.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/Client/angular-local-admin-page.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list