[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. a498b2f1af39e1867e94a7aca0279775389aa690
Evergreen Git
git at git.evergreen-ils.org
Fri Nov 1 15:40:33 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, rel_3_3 has been updated
via a498b2f1af39e1867e94a7aca0279775389aa690 (commit)
via 33386c93875e5ae5606ac0f55f606d5487775f53 (commit)
via 7c82c0b7a13deca1bf039201ba0fcb234f285d79 (commit)
from c04c4b35f33f14c8d71a13c8a0b6ed789335c557 (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 a498b2f1af39e1867e94a7aca0279775389aa690
Author: Kyle Huckins <khuckins at catalyte.io>
Date: Fri Jul 5 14:36:05 2019 +0000
lp1437103 Allow Receipts to Print when Suppressing Popups
- Move suppress_popup check further along and allow transit receipts
to properly print when popups suppressed.
Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
Changes to be committed:
modified: Open-ILS/web/js/ui/default/staff/circ/services/circ.js
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index c31c48161b..b82aca11fa 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -1662,7 +1662,6 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl
}
service.route_dialog = function(tmpl, evt, params, options) {
- if (options.suppress_popups) return;
if (angular.isArray(evt)) evt = evt[0];
return service.collect_route_data(tmpl, evt, params, options)
@@ -1729,7 +1728,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl
// when auto-print is on, skip the dialog and go straight
// to printing.
- if (options.auto_print_holds_transits)
+ if (options.auto_print_holds_transits || options.suppress_popups)
return print_transit(template);
return $uibModal.open({
commit 33386c93875e5ae5606ac0f55f606d5487775f53
Author: Kyle Huckins <khuckins at catalyte.io>
Date: Wed Jun 26 15:36:09 2019 +0000
lp1437103 Suppress Popups on Patron Items Out Checkin
- Make Patron Items Out UI respect Suppress Popups setting.
Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
Changes to be committed:
modified: Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
index 327eeb5fe6..96cc65cd6b 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
@@ -30,6 +30,12 @@ function($scope , $q , $routeParams , $timeout , egCore , egUser , patronSvc ,
// list of alt circs (lost, etc.) and/or check-in with fines circs
$scope.alt_list = [];
+
+ egCore.org.settings([
+ 'ui.circ.suppress_checkin_popups' // add other settings as needed
+ ]).then(function(set) {
+ $scope.suppress_popups = set['ui.circ.suppress_checkin_popups'];
+ });
// these are fetched during startup (i.e. .configure())
// By default, show lost/lo/cr items in the alt list
@@ -511,26 +517,31 @@ function($scope , $q , $routeParams , $timeout , egCore , egUser , patronSvc ,
if (!items.length) return;
var copies = items.map(function(circ) { return circ.target_copy() });
var barcodes = copies.map(function(copy) { return copy.barcode() });
-
- return egConfirmDialog.open(
- egCore.strings.CHECK_IN_CONFIRM, barcodes.join(' '), {
-
- }).result.then(function() {
- var copy;
- function do_one() {
- if (copy = copies.pop()) {
- // Checkin expects a barcode, but will pass other
- // parameters too. Passing the copy ID allows
- // for the checkin of deleted copies on the server.
- egCirc.checkin(
- {copy_barcode: copy.barcode(), copy_id: copy.id()})
- .finally(do_one);
- } else {
- reset_page();
- }
+
+ var copy;
+ function do_one() {
+ if (copy = copies.pop()) {
+ // Checkin expects a barcode, but will pass other
+ // parameters too. Passing the copy ID allows
+ // for the checkin of deleted copies on the server.
+ egCirc.checkin(
+ {copy_barcode: copy.barcode(), copy_id: copy.id()},
+ {suppress_popups: $scope.suppress_popups})
+ .finally(do_one);
+ } else {
+ reset_page();
}
- do_one(); // kick it off
- });
+ }
+ if ($scope.suppress_popups) {
+ do_one();
+ } else {
+ return egConfirmDialog.open(
+ egCore.strings.CHECK_IN_CONFIRM, barcodes.join(' '), {
+
+ }).result.then(function() {
+ do_one(); // kick it off
+ });
+ }
}
$scope.add_billing = function(items) {
commit 7c82c0b7a13deca1bf039201ba0fcb234f285d79
Author: Kyle Huckins <khuckins at catalyte.io>
Date: Tue Jun 25 16:47:04 2019 +0000
lp1437103 - Suppress Popups based on OU Setting
- Allow OU setting to suppress checkin popups to properly take effect.
Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
Changes to be committed:
modified: Open-ILS/web/js/ui/default/staff/circ/services/circ.js
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 6c2d30d50e..c31c48161b 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -459,7 +459,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl
}
- if (options.suppress_checkin_popups
+ if (options.suppress_popups
&& evt.filter(function(e){return service.checkin_suppress_overrides.indexOf(e.textcode) == -1;}).length == 0) {
// Events are suppressed. Re-run the checkin w/ override.
options.override = true;
@@ -1489,7 +1489,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl
var copy = evt && evt.payload ? evt.payload.copy : null;
- if (copy && !options.suppress_checkin_popups
+ if (copy && !options.suppress_popups
&& copy.location().checkin_alert() == 't') {
return egAlertDialog.open(
@@ -1568,7 +1568,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl
case 11: /* CATALOGING */
egCore.audio.play('info.checkin.cataloging');
evt[0].route_to = egCore.strings.ROUTE_TO_CATALOGING;
- if (options.no_precat_alert)
+ if (options.no_precat_alert || options.suppress_popups)
return $q.when(final_resp);
return egAlertDialog.open(
egCore.strings.PRECAT_CHECKIN_MSG, params)
@@ -1595,6 +1595,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl
case 'ASSET_COPY_NOT_FOUND':
egCore.audio.play('error.checkin.not_found');
+ if (options.suppress_popups) return $q.when(final_resp);
return egAlertDialog.open(
egCore.strings.UNCAT_ALERT_DIALOG, params)
.result.then(function() {return final_resp});
@@ -1602,7 +1603,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl
case 'ITEM_NOT_CATALOGED':
egCore.audio.play('error.checkin.not_cataloged');
evt[0].route_to = egCore.strings.ROUTE_TO_CATALOGING;
- if (options.no_precat_alert)
+ if (options.no_precat_alert || options.suppress_popups)
return $q.when(final_resp);
return egAlertDialog.open(
egCore.strings.PRECAT_CHECKIN_MSG, params)
@@ -1661,6 +1662,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl
}
service.route_dialog = function(tmpl, evt, params, options) {
+ if (options.suppress_popups) return;
if (angular.isArray(evt)) evt = evt[0];
return service.collect_route_data(tmpl, evt, params, options)
-----------------------------------------------------------------------
Summary of changes:
.../js/ui/default/staff/circ/patron/items_out.js | 49 +++++++++++++---------
.../web/js/ui/default/staff/circ/services/circ.js | 11 ++---
2 files changed, 36 insertions(+), 24 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list