From 0ee77a814c069819f271b63516d6e979212c2ad0 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 13 Jul 2022 12:18:36 -0400 Subject: [PATCH] Revert "LP1904036 Separate Circulation (Experimental) Menu" Replacing this with an alternate approach which can revert all menu items, links, buttons, etc. from old to new UI in one swoop. This reverts commit 5d77dc9426e669a824a31658f348689c05675411. --- Open-ILS/src/eg2/src/app/staff/nav.component.html | 66 ++++-------------- Open-ILS/src/eg2/src/app/staff/nav.component.ts | 14 ---- Open-ILS/src/eg2/src/app/staff/resolver.service.ts | 1 - .../eg2/src/app/staff/share/circ/circ.service.ts | 2 +- .../sql/Pg/upgrade/XXXX.data.angular-patron.sql | 18 +---- Open-ILS/src/templates/staff/navbar.tt2 | 81 +++++----------------- .../web/js/ui/default/staff/services/navbar.js | 3 - 7 files changed, 36 insertions(+), 149 deletions(-) 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 11e9f07307..6ab79944d1 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.html +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html @@ -23,6 +23,10 @@ Search for Patrons + + + Search for Patrons (Experimental) + Search for Items by Barcode @@ -55,6 +59,12 @@ Check In + + + Check In (Experimental) + @@ -75,6 +85,10 @@ Renew Items + + + Renew Items (Experimental) + @@ -87,7 +101,7 @@ Retrieve Last Patron - + Retrieve Recent Patrons @@ -154,56 +168,6 @@ - -
-
- - Circulation (Experimental) - -
- - - Search for Patrons - -
- - - Check Out - - - - Check In - - - - Capture Holds - - - - Renew Items - - - - Register Patron - - - - Retrieve Last Patron - - - - Retrieve Recent Patrons - -
-
-
-
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.ts b/Open-ILS/src/eg2/src/app/staff/nav.component.ts index 84c93a9b68..89d98ac31e 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.ts @@ -26,9 +26,6 @@ export class StaffNavComponent implements OnInit, OnDestroy { // When active, show a link to the experimental Angular staff catalog showAngularCatalog: boolean; curbsideEnabled: boolean; - showAngularCirc = false; // ui.staff.angular_circ.enabled - showRecentPatron = false; - showRecentPatrons = false; @ViewChild('navOpChange', {static: false}) opChange: OpChangeComponent; permFailedSub: Subscription; @@ -75,17 +72,6 @@ export class StaffNavComponent implements OnInit, OnDestroy { this.permFailedSub = this.net.permFailed$.subscribe( (req: NetRequest) => this.opChange.escalateRequest(req)); - - this.org.settings([ - 'ui.staff.angular_circ.enabled', - 'ui.staff.max_recent_patrons' - ]) - .then(sets => { - this.showAngularCirc = sets['ui.staff.angular_circ.enabled']; - const maxRecent = Number(sets['ui.staff.max_recent_patrons']); - this.showRecentPatron = maxRecent > 0; - this.showRecentPatrons = maxRecent > 1; - }); } ngOnDestroy() { diff --git a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts index ad9dc1010c..de6252b059 100644 --- a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts @@ -141,7 +141,6 @@ export class StaffResolver implements Resolve> { 'webstaff.format.dates', 'webstaff.format.date_and_time', 'ui.staff.max_recent_patrons', - 'ui.staff.angular_circ.enabled', 'ui.staff.angular_catalog.enabled' // navbar ]).then(settings => { // Avoid clobbering defaults diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts index 810ab305a6..630ba72279 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts @@ -1208,7 +1208,7 @@ export class CircService { return this.components.badBarcodeDialog.open().toPromise() // Avoid prompting again on an override .then(response => { - params._checkbarcode = false; + params._checkbarcode = false return response; }); } diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql index 98e668b424..58abf7c38c 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql @@ -422,7 +422,7 @@ UPDATE config.print_template SET template = $TEMPLATE$
Printed by [% staff.first_given_name %] at [% staff_org.shortname %]
-$TEMPLATE$ WHERE name = 'hold_transit_slip'; +$TEMPLATE$ WHERE name = 'transit_slip'; INSERT INTO config.print_template (name, label, owner, active, locale, content_type, template) @@ -641,22 +641,6 @@ UPDATE config.print_template SET template = $TEMPLATE$ $TEMPLATE$ WHERE name = 'renew'; -INSERT into config.org_unit_setting_type (name, grp, label, description, datatype) -VALUES ( - 'ui.staff.angular_circ.enabled', 'gui', - oils_i18n_gettext( - 'ui.staff.angular_circ.enabled', - 'Enable Angular Circulation Menu', - 'coust', 'label' - ), - oils_i18n_gettext( - 'ui.staff.angular_circ.enabled', - 'Enable the Circulation menu for the experimental Angular Circulation UIs', - 'coust', 'description' - ), - 'bool' -); - COMMIT; diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2 index 16720226cd..ccb286f361 100644 --- a/Open-ILS/src/templates/staff/navbar.tt2 +++ b/Open-ILS/src/templates/staff/navbar.tt2 @@ -43,6 +43,12 @@
  • + + + [% l('Search for Patrons (Experimental)') %] + +
    • +
  • @@ -93,6 +99,12 @@ [% l('Check In') %]
    • +
  • + + + [% l('Check In (Experimental)') %] + +
    • +
  • + + + [% l('Renew Items (Experimental)') %] + +
    • +
    • - -
  • - [% l('Circulation (Experimental)') %] - - - -
    • -
  • [% l('Cataloging') %]