[open-ils-commits] [GIT] Evergreen ILS branch master updated. fca751f65dd2afbb4a7b70d6ab92f49479d22b30
Evergreen Git
git at git.evergreen-ils.org
Mon Mar 13 10:45:57 EDT 2017
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 fca751f65dd2afbb4a7b70d6ab92f49479d22b30 (commit)
via 961970fab4feb9484cb276ac386fd0779cd86e74 (commit)
from f50e5e83398f60b4b084527b32ac082e4a5207ac (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 fca751f65dd2afbb4a7b70d6ab92f49479d22b30
Author: Kathy Lussier <klussier at masslnc.org>
Date: Thu Mar 2 23:52:30 2017 -0500
LP#1522644: Make Mark for Hold Transfer option consistent with other options
Makes the following changes to the Mark for Holds Transfer Destination option:
1) Changes the label from "Mark As Title Hold Transfer Destination" to "Title
Hold Transfer." The 'Mark" piece is already implied in the "Mark For" button
label, and the long text was pushing the menu off the screen for some displays.
2) Makes the option behave as other Mark options. If a record is already marked,
it displays the marked Record ID in the menu. The mark is also removed when the
"Reset Record Marks" option is clicked.
3) Pushes the reset option down to the bottom of the menu and alphabetizes the
other Mark options above it.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
index 8509bf3..0848890 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -33,32 +33,33 @@
[% l('Mark for:') %] <span class="caret"></span>
</button>
<ul uib-dropdown-menu role="menu" aria-labelledby="mark-for-button">
- <li role="menuitem">
+ <li role="menuitem">
+ <a ng-click="markConjoined()">
+ [% l('Conjoined Items') %]
+ <span class="target-record-aside" ng-if="current_conjoined_target">[% l('(Currently [_1])', '{{current_conjoined_target}}') %]</span>
+ </a>
+ </li>
+ <li role="menuitem">
<a ng-click="markOverlay()">
[% l('Overlay Target') %]
<span class="target-record-aside" ng-if="current_overlay_target">[% l('(Currently [_1])', '{{current_overlay_target}}') %]</span>
</a>
</li>
<li role="menuitem">
- <a ng-click="markVolTransfer()">
- [% l('Volume Transfer') %]
- <span class="target-record-aside" ng-if="current_voltransfer_target">[% l('(Currently [_1])', '{{current_voltransfer_target}}') %]</span>
+ <a ng-click="mark_hold_transfer_dest()">
+ [% l('Title Hold Transfer') %]
+ <span class="target-record-aside" ng-if="current_hold_transfer_dest">[% l('(Currently [_1])', '{{current_hold_transfer_dest}}') %]</span>
</a>
</li>
<li role="menuitem">
- <a ng-click="markConjoined()">
- [% l('Conjoined Items') %]
- <span class="target-record-aside" ng-if="current_conjoined_target">[% l('(Currently [_1])', '{{current_conjoined_target}}') %]</span>
+ <a ng-click="markVolTransfer()">
+ [% l('Volume Transfer') %]
+ <span class="target-record-aside" ng-if="current_voltransfer_target">[% l('(Currently [_1])', '{{current_voltransfer_target}}') %]</span>
</a>
</li>
<li role="menuitem">
<a ng-click="clearRecordMarks()">[% l('Reset Record Marks') %]</a>
</li>
- <li role="menuitem">
- <a ng-click="mark_hold_transfer_dest()">
- [% l('Mark as Title Hold Transfer Destination') %]
- </a>
- </li>
</ul>
</div>
</div>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
index 54f6396..0517970 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
@@ -387,9 +387,11 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
$scope.current_overlay_target = null;
$scope.current_voltransfer_target = null;
$scope.current_conjoined_target = null;
+ $scope.current_hold_transfer_dest = null;
egCore.hatch.removeLocalItem('eg.cat.marked_volume_transfer_record');
egCore.hatch.removeLocalItem('eg.cat.marked_conjoined_record');
egCore.hatch.removeLocalItem('eg.cat.marked_overlay_record');
+ egCore.hatch.removeLocalItem('eg.circ.hold.title_transfer_target');
}
$scope.stop_unload = false;
@@ -1440,7 +1442,10 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
});
}
+ $scope.current_hold_transfer_dest = egCore.hatch.getLocalItem ('eg.circ.hold.title_transfer_target');
+
$scope.mark_hold_transfer_dest = function() {
+ $scope.current_hold_transfer_dest = $scope.record_id;
egCore.hatch.setLocalItem(
'eg.circ.hold.title_transfer_target', $scope.record_id);
ngToast.create(egCore.strings.HOLD_TRANSFER_DEST_MARKED);
commit 961970fab4feb9484cb276ac386fd0779cd86e74
Author: Victoria Lewis <vlewis at catalystdevworks.com>
Date: Fri Jan 13 11:42:37 2017 -0800
LP#1522644: webclient: Transfer title holds issues
Hid "Transfer All Titles" button from the View Holds tab of the bib record
Moved the "Mark as Title Hold Transfer Destination" button to the
"Mark For:" dropdown to make it more consistent with other "mark" actions.
To test
-------
[1] Place a hold on a title.
[2] Choose another title. Under "Mark For" click
"Mark as Title Hold Transfer Destination"
[3] Return to original title on hold. Under "Actions"
click "Transfer To Marked Title"
[4] Confirm that hold is transfered.
Signed-off-by: Victoria Lewis <vlewis at catalystdevworks.com>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
index 632c0be..8509bf3 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -54,6 +54,11 @@
<li role="menuitem">
<a ng-click="clearRecordMarks()">[% l('Reset Record Marks') %]</a>
</li>
+ <li role="menuitem">
+ <a ng-click="mark_hold_transfer_dest()">
+ [% l('Mark as Title Hold Transfer Destination') %]
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
index c88663f..f793a66 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
@@ -19,10 +19,10 @@
<eg-grid-menu-item handler="detail_view"
label="[% l('Detail View') %]"></eg-grid-menu-item>
- <eg-grid-menu-item handler="mark_hold_transfer_dest"
+ <!-- <eg-grid-menu-item handler="mark_hold_transfer_dest"
label="[% l('Mark as Title Hold Transfer Destination') %]"></eg-grid-menu-item>
- <eg-grid-menu-item handler="transfer_holds_to_marked"
- label="[% l('Transfer All Title Holds') %]"></eg-grid-menu-item>
+ <eg-grid-menu-item handler="transfer_holds_to_marked"
+ label="[% l('Transfer All Title Holds') %]"></eg-grid-menu-item> -->
<eg-grid-action handler="grid_actions.show_recent_circs" group="[% l('Copy') %]"
label="[% l('Show Last Few Circulations') %]"></eg-grid-action>
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/staff/cat/catalog/t_catalog.tt2 | 20 +++++++++++++-------
.../src/templates/staff/cat/catalog/t_holds.tt2 | 6 +++---
.../web/js/ui/default/staff/cat/catalog/app.js | 5 +++++
3 files changed, 21 insertions(+), 10 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list