[open-ils-commits] [GIT] Evergreen ILS branch master updated. 60eec432440657a51e8fd0fb6622e5620750ab9f
Evergreen Git
git at git.evergreen-ils.org
Wed Jul 11 13:10:27 EDT 2018
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 60eec432440657a51e8fd0fb6622e5620750ab9f (commit)
via 6c511a7d53eefa0b543c2212f8064f60cd74dd7a (commit)
from d8de66599444d919e854eb511403165cc258ace0 (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 60eec432440657a51e8fd0fb6622e5620750ab9f
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Mar 27 14:56:23 2018 -0400
LP#1746566: Enable 500, 1K, and all rows in more patron grids
This enables the allowAll option in the Patron Items Checked Out
and Other/Special Circulations grids.
To test
-------
[1] Apply the patch.
[2] Verify that the Patron Items Checked Out, Other/Special Circulations,
Non-Catalogued Circulations, and Holds grids now include row
count options 500, 100, and All.
[3] Verify that the Item Status grid now includes the additional
row count options.
[4] Verify that when choosing the "All" row count that you are prompted
to confirm loading all of the rows.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index d3ac6de..33d3796 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -46,7 +46,7 @@
ng-if="items_out_display != 'noncat'"
idl-class="circ"
id-field="id"
- features="clientsort"
+ features="clientsort,allowAll"
items-provider="gridDataProvider"
persist-key="circ.patron.items_out"
dateformat="{{$root.egDateAndTimeFormat}}">
commit 6c511a7d53eefa0b543c2212f8064f60cd74dd7a
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Wed Feb 7 12:05:10 2018 -0500
LP#1746566: Enable 500, 1K, and ALL-the-Rows in patron grids
This adds to the Patron (non-catalogued) Items Out, Patron Holds, and
Item Status grids an 'allowAll' grid feature which will enable the 500,
1K, and ALL (really 10K) rows/pagesize. For the ALL option a modal has
been wired to that the action can be confirmed, since it might be a
very slow operation.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index e2e88de..11ec8ec 100644
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -138,6 +138,8 @@ UpUp.start({
s.CONFIRM_IN_HOUSE_NUM_USES_COUNT_TITLE = "[% l('Are you sure you want to record {{num_uses}} uses for this?') %]";
s.PAGE_TITLE_DEFAULT = "[% l('Evergreen Staff Client') %]";
s.PAGE_TITLE_DYNAMIC_AND_CONTEXT = "[% l('[_1] - [_2]', '{{dynamic}}', '{{context}}') %]";
+ s.CONFIRM_LONG_RUNNING_ACTION_MSG = "[% l('This action might take a while to complete. Continue?') %]";
+ s.CONFIRM_LONG_RUNNING_ACTION_ALL_ROWS_TITLE = "[% l('Are you sure you want to load ALL items?') %]";
}]);
</script>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 08435d0..1d2602c 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -1,7 +1,7 @@
<eg-grid
id-field="index"
idl-class="acp"
- features="-display,clientsort"
+ features="-display,clientsort,allowAll"
main-label="[% l('Item Status') %]"
items-provider="gridDataProvider"
grid-controls="gridControls"
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index 9c8962e..8f46910 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -1,6 +1,6 @@
<eg-grid
id-field="id"
- features="clientsort"
+ features="clientsort,allowAll"
items-provider="gridDataProvider"
persist-key="circ.patron.holds"
dateformat="{{$root.egDateAndTimeFormat}}">
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index 45c467c..d3ac6de 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -29,7 +29,7 @@
ng-if="items_out_display == 'noncat'"
idl-class="ancc"
id-field="id"
- features="clientsort"
+ features="clientsort,allowAll"
items-provider="gridDataProvider"
persist-key="circ.patron.items_out.noncat"
dateformat="{{$root.egDateAndTimeFormat}}">
diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index 58b3534..303e191 100644
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -120,8 +120,13 @@
{{t}}
</a>
</li>
+ <li ng-if="allowAll" ng-repeat="t in [500,1000]">
+ <a href ng-click='offset(0);limit(t);collect()'>
+ {{t}}
+ </a>
+ </li>
<li ng-if="allowAll" >
- <a href ng-click='offset(0);limit(10000);collect()'>[% l('All') %]</a>
+ <a href ng-click='confirmAllowAllAndCollect();'>[% l('All') %]</a>
</li>
</ul>
</div>
diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js
index c774c7f..688a257 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -127,10 +127,10 @@ angular.module('egGridMod',
controller : [
'$scope','$q','egCore','egGridFlatDataProvider','$location',
'egGridColumnsProvider','$filter','$window','$sce','$timeout',
- 'egProgressDialog','$uibModal',
+ 'egProgressDialog','$uibModal','egConfirmDialog','egStrings',
function($scope, $q , egCore, egGridFlatDataProvider , $location,
egGridColumnsProvider , $filter , $window , $sce , $timeout,
- egProgressDialog , $uibModal) {
+ egProgressDialog, $uibModal , egConfirmDialog , egStrings) {
var grid = this;
@@ -1188,6 +1188,18 @@ angular.module('egGridMod',
$scope.collect = function() { grid.collect() }
+
+ $scope.confirmAllowAllAndCollect = function(){
+ egConfirmDialog.open(egStrings.CONFIRM_LONG_RUNNING_ACTION_ALL_ROWS_TITLE,
+ egStrings.CONFIRM_LONG_RUNNING_ACTION_MSG)
+ .result
+ .then(function(){
+ $scope.offset(0);
+ $scope.limit(10000);
+ grid.collect();
+ });
+ }
+
// asks the dataProvider for a page of data
grid.collect = function() {
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/staff/base_js.tt2 | 2 ++
Open-ILS/src/templates/staff/cat/item/t_list.tt2 | 2 +-
.../templates/staff/circ/patron/t_holds_list.tt2 | 2 +-
.../templates/staff/circ/patron/t_items_out.tt2 | 4 ++--
Open-ILS/src/templates/staff/share/t_autogrid.tt2 | 7 ++++++-
Open-ILS/web/js/ui/default/staff/services/grid.js | 16 ++++++++++++++--
6 files changed, 26 insertions(+), 7 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list