[open-ils-commits] [GIT] Evergreen ILS branch master updated. ffcde0b99035f4afee7e527becdf1aa913af6d70
Evergreen Git
git at git.evergreen-ils.org
Tue Jun 25 10:20:26 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 ffcde0b99035f4afee7e527becdf1aa913af6d70 (commit)
from eee5c5948ca8dea98088007e11280c4809fd925a (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 ffcde0b99035f4afee7e527becdf1aa913af6d70
Author: Kyle Huckins <khuckins at catalyte.io>
Date: Mon May 20 17:54:00 2019 +0000
lp1735835 Transfer Bucket Contents to Pending
- Add new option in Copy/Record buckets to transfer select
items to Pending Copy/Records.
Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
modified: Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
modified: Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
modified: Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js
modified: Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
index edb83bcae2..5eb522ce5a 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
@@ -12,6 +12,8 @@
<eg-grid-action label="[% l('Remove Selected Items from Bucket') %]" group="[% l('Bucket') %]"
handler="detachCopies"></eg-grid-action>
+ <eg-grid-action label="[% l('Move Selected Items to Pending Items') %]" group="[% l('Bucket') %]"
+ handler="moveToPending"></eg-grid-action>
<eg-grid-action label="[% l('Request Selected Items') %]" group="[% l('Items') %]"
handler="requestItems"></eg-grid-action>
<eg-grid-action label="[% l('Edit Selected Items') %]" group="[% l('Items') %]"
diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
index ab7461b973..a30697c6e5 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2
@@ -16,6 +16,9 @@
<eg-grid-action label="[% l('Remove Selected Records from Bucket') %]"
handler="detachRecords"></eg-grid-action>
+ <eg-grid-action label="[% l('Move Selected Records to Pending Records') %]"
+ handler="moveToPending"></eg-grid-action>
+
<eg-grid-action label="[% l('Delete Selected Records from Catalog') %]"
handler="deleteRecordsFromCatalog"></eg-grid-action>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js
index 70eb084fd4..f23b8a9649 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js
@@ -560,6 +560,13 @@ function($scope, $q , $routeParams , $timeout , $window , $uibModal , bucketSvc
bucketSvc.bucketNeedsRefresh = true;
return $q.all(promises).then(drawBucket);
}
+
+ $scope.moveToPending = function(copies) {
+ angular.forEach(copies, function(copy) {
+ bucketSvc.pendingList.push(copy.id);
+ });
+ $scope.detachCopies(copies);
+ }
$scope.spawnHoldingsEdit = function (copies) {
var cp_list = []
diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
index e7c80d3d26..8aaa4db80b 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
@@ -751,6 +751,15 @@ function($scope, $q , $routeParams, bucketSvc, egCore, $window,
return $q.all(promises).then(drawBucket);
}
+ $scope.moveToPending = function(records) {
+ angular.forEach(records, function(rec) {
+ if (bucketSvc.pendingList.filter( // remove dupes
+ function(r) {return r.id == rec.id}).length) return;
+ bucketSvc.pendingList.push(rec);
+ });
+ $scope.detachRecords(records);
+ }
+
$scope.deleteRecordsFromCatalog = function(records) {
egConfirmDialog.open(
egCore.strings.CONFIRM_DELETE_RECORD_BUCKET_ITEMS_FROM_CATALOG,
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 | 2 ++
Open-ILS/src/templates/staff/cat/bucket/record/t_view.tt2 | 3 +++
Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js | 7 +++++++
Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js | 9 +++++++++
4 files changed, 21 insertions(+)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list