[open-ils-commits] [GIT] Evergreen ILS branch master updated. f6d79995818756309ae6138b4b5e887150ca6df8
Evergreen Git
git at git.evergreen-ils.org
Tue Oct 23 14:19:57 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 f6d79995818756309ae6138b4b5e887150ca6df8 (commit)
via 6cd17f19a24d1e6e0ee05afd5ff3cc764a8968ef (commit)
via 7674fd62221a5047c62ed6cd927357d49822e102 (commit)
via c7516dc63ffd8da8d594b30faf709141755a1f37 (commit)
via 317c2fdc537948af4da2999cbafb7c3f290dad3a (commit)
from f64ec2e462827b8c7aac0008ebe11880bb389964 (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 f6d79995818756309ae6138b4b5e887150ca6df8
Author: Kathy Lussier <klussier at masslnc.org>
Date: Wed Sep 26 14:45:26 2018 -0400
LP#1746536: Remove input-group-addon class from Add Call Number button
The button no longer looks like a button with this class in place.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
index d8994e7..7d32580 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -79,7 +79,7 @@
<eg-org-selector alldisabled="{{record_id == 0}}" selected="new_lib_to_add" onchange="changeNewLib" disable-test="cant_have_vols"></eg-org-selector>
</div>
<div class="col-xs-2">
- <button class="btn btn-default input-group-addon" ng-disabled="record_id == 0" ng-click="addLibToStruct()" type="button">[% l('Add call number') %]</button>
+ <button class="btn btn-default" ng-disabled="record_id == 0" ng-click="addLibToStruct()" type="button">[% l('Add call number') %]</button>
</div>
</div>
</div>
commit 6cd17f19a24d1e6e0ee05afd5ff3cc764a8968ef
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Sep 26 12:57:04 2018 -0400
LP#1746536: Restrict CN addition but allow CN edits...
... in the top half of the Vol/Copy editor when there are multiple bib records
represented in the UI.
Also, restrict the size of the org selector using a bootstrap row.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Conflicts:
Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
index f7b819b..d8994e7 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -74,9 +74,13 @@
struct="data.tree[lib]">
</eg-vol-edit>
<hr/>
- <div>
- <eg-org-selector alldisabled="{{record_id == 0}}" selected="new_lib_to_add" onchange="changeNewLib" disable-test="cant_have_vols"></eg-org-selector>
- <button class="btn btn-default" ng-click="addLibToStruct()" type="button">[% l('Add call number') %]</button>
+ <div class="row">
+ <div class="col-xs-2">
+ <eg-org-selector alldisabled="{{record_id == 0}}" selected="new_lib_to_add" onchange="changeNewLib" disable-test="cant_have_vols"></eg-org-selector>
+ </div>
+ <div class="col-xs-2">
+ <button class="btn btn-default input-group-addon" ng-disabled="record_id == 0" ng-click="addLibToStruct()" type="button">[% l('Add call number') %]</button>
+ </div>
</div>
</div>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index 118ff4b..90f9dcf 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -493,7 +493,7 @@ function(egCore , $q) {
'<div class="label label-danger" ng-if="empty_barcode">{{empty_barcode_string}}</div>'+
'</div>'+
'<div class="col-xs-3"><input class="form-control" type="number" min="1" ng-model="copy_number" ng-change="updateCopyNo()"/></div>'+
- '<div class="col-xs-3"><eg-basic-combo-box eg-disabled="record == 0" list="parts" selected="part"></eg-basic-combo-box></div>'+
+ '<div class="col-xs-3"><eg-basic-combo-box list="parts" selected="part"></eg-basic-combo-box></div>'+
'</div>',
scope: { focusNext: "=", copy: "=", callNumber: "=", index: "@", record: "@" },
@@ -585,19 +585,19 @@ function(egCore , $q) {
'<div class="row">'+
'<div class="col-xs-2">'+
'<button aria-label="Delete" style="margin:-5px -15px; float:left;" ng-hide="callNumber.not_ephemeral" type="button" class="close" ng-click="removeCN()">×</button>' +
- '<select ng-disabled="record == 0 && !onlyVols" class="form-control" ng-model="classification" ng-change="updateClassification()" ng-options="cl.name() for cl in classification_list"/>'+
+ '<select class="form-control" ng-model="classification" ng-change="updateClassification()" ng-options="cl.name() for cl in classification_list"/>'+
'</div>'+
'<div class="col-xs-1">'+
- '<select ng-disabled="record == 0 && !onlyVols" class="form-control" ng-model="prefix" ng-change="updatePrefix()" ng-options="p.label() for p in prefix_list"/>'+
+ '<select class="form-control" ng-model="prefix" ng-change="updatePrefix()" ng-options="p.label() for p in prefix_list"/>'+
'</div>'+
'<div class="col-xs-2">'+
- '<input ng-disabled="record == 0 && !onlyVols" class="form-control" type="text" ng-change="updateLabel()" ng-model="label"/>'+
+ '<input class="form-control" type="text" ng-change="updateLabel()" ng-model="label"/>'+
'<div class="label label-danger" ng-if="empty_label">{{empty_label_string}}</div>'+
'</div>'+
'<div class="col-xs-1">'+
- '<select ng-disabled="record == 0 && !onlyVols" class="form-control" ng-model="suffix" ng-change="updateSuffix()" ng-options="s.label() for s in suffix_list"/>'+
+ '<select class="form-control" ng-model="suffix" ng-change="updateSuffix()" ng-options="s.label() for s in suffix_list"/>'+
'</div>'+
- '<div ng-hide="onlyVols" class="col-xs-1"><input ng-disabled="record == 0" class="form-control" type="number" ng-model="copy_count" min="{{orig_copy_count}}" ng-change="changeCPCount()"></div>'+
+ '<div ng-hide="onlyVols" class="col-xs-1"><input class="form-control" type="number" ng-model="copy_count" min="{{orig_copy_count}}" ng-change="changeCPCount()"></div>'+
'<div ng-hide="onlyVols" class="col-xs-5">'+
'<eg-vol-copy-edit record="{{record}}" ng-repeat="cp in copies track by idTracker(cp)" focus-next="focusNextBarcode" copy="cp" call-number="callNumber"></eg-vol-copy-edit>'+
'</div>'+
@@ -830,9 +830,8 @@ function(egCore , $q) {
replace: true,
template:
'<div class="row">'+
- '<div class="col-xs-1"><eg-org-selector alldisabled="{{record == 0}}" selected="owning_lib" disable-test="cant_have_vols"></eg-org-selector></div>'+
- '<div class="col-xs-1"><eg-org-selector alldisabled="{{record == 0 && !onlyVols}}" selected="owning_lib" disable-test="cant_have_vols"></eg-org-selector></div>'+
- '<div class="col-xs-1"><input ng-disabled="record == 0" class="form-control" type="number" min="{{orig_cn_count}}" ng-model="cn_count" ng-change="changeCNCount()"/></div>'+
+ '<div class="col-xs-1"><eg-org-selector selected="owning_lib" disable-test="cant_have_vols"></eg-org-selector></div>'+
+ '<div class="col-xs-1"><input class="form-control" type="number" min="{{orig_cn_count}}" ng-model="cn_count" ng-change="changeCNCount()"/></div>'+
'<div class="col-xs-10">'+
'<eg-vol-row only-vols="onlyVols" record="{{record}}"'+
'ng-repeat="(cn,copies) in struct" '+
commit 7674fd62221a5047c62ed6cd927357d49822e102
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Sep 19 10:38:42 2018 -0400
LP#1746536: Allow batch-apply to volume fields in multi-record context
I can't see a reason to restrict Batch Apply for volume fields in a multi-
record context, as all the data is gathered based on the volume owners, not
record information. This commit removes that restriction.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
index c3fb82b..f7b819b 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -14,7 +14,7 @@
</div>
<div class="container-fluid pad-vert" ng-show="show_vols">
- <div ng-show="record_id" class="row bg-info">
+ <div class="row bg-info">
<div class="col-xs-2"><h4 class="center-block">[% l('Batch Apply') %]</h4></div>
<div class="col-xs-10">
<div class="row">
commit c7516dc63ffd8da8d594b30faf709141755a1f37
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Wed Sep 12 05:37:28 2018 -0400
LP#1746536 - enable volcopy editor for multi-bib but only volumes
This removes the disabling of the volcopy editor caused by
passing it a record id of 0. Allowing the Item Status grid's
Edit>Volumes to function as a way to batch edit volumes of
more than 1 bib record.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index a289134..118ff4b 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -585,17 +585,17 @@ function(egCore , $q) {
'<div class="row">'+
'<div class="col-xs-2">'+
'<button aria-label="Delete" style="margin:-5px -15px; float:left;" ng-hide="callNumber.not_ephemeral" type="button" class="close" ng-click="removeCN()">×</button>' +
- '<select ng-disabled="record == 0" class="form-control" ng-model="classification" ng-change="updateClassification()" ng-options="cl.name() for cl in classification_list"/>'+
+ '<select ng-disabled="record == 0 && !onlyVols" class="form-control" ng-model="classification" ng-change="updateClassification()" ng-options="cl.name() for cl in classification_list"/>'+
'</div>'+
'<div class="col-xs-1">'+
- '<select ng-disabled="record == 0" class="form-control" ng-model="prefix" ng-change="updatePrefix()" ng-options="p.label() for p in prefix_list"/>'+
+ '<select ng-disabled="record == 0 && !onlyVols" class="form-control" ng-model="prefix" ng-change="updatePrefix()" ng-options="p.label() for p in prefix_list"/>'+
'</div>'+
'<div class="col-xs-2">'+
- '<input ng-disabled="record == 0" class="form-control" type="text" ng-change="updateLabel()" ng-model="label"/>'+
+ '<input ng-disabled="record == 0 && !onlyVols" class="form-control" type="text" ng-change="updateLabel()" ng-model="label"/>'+
'<div class="label label-danger" ng-if="empty_label">{{empty_label_string}}</div>'+
'</div>'+
'<div class="col-xs-1">'+
- '<select ng-disabled="record == 0" class="form-control" ng-model="suffix" ng-change="updateSuffix()" ng-options="s.label() for s in suffix_list"/>'+
+ '<select ng-disabled="record == 0 && !onlyVols" class="form-control" ng-model="suffix" ng-change="updateSuffix()" ng-options="s.label() for s in suffix_list"/>'+
'</div>'+
'<div ng-hide="onlyVols" class="col-xs-1"><input ng-disabled="record == 0" class="form-control" type="number" ng-model="copy_count" min="{{orig_copy_count}}" ng-change="changeCPCount()"></div>'+
'<div ng-hide="onlyVols" class="col-xs-5">'+
@@ -831,7 +831,8 @@ function(egCore , $q) {
template:
'<div class="row">'+
'<div class="col-xs-1"><eg-org-selector alldisabled="{{record == 0}}" selected="owning_lib" disable-test="cant_have_vols"></eg-org-selector></div>'+
- '<div class="col-xs-1"><input name="cn_count_lib{{lib}}" ng-disabled="record == 0" class="form-control" type="number" min="{{orig_cn_count}}" ng-model="cn_count" ng-change="changeCNCount()"/></div>'+
+ '<div class="col-xs-1"><eg-org-selector alldisabled="{{record == 0 && !onlyVols}}" selected="owning_lib" disable-test="cant_have_vols"></eg-org-selector></div>'+
+ '<div class="col-xs-1"><input ng-disabled="record == 0" class="form-control" type="number" min="{{orig_cn_count}}" ng-model="cn_count" ng-change="changeCNCount()"/></div>'+
'<div class="col-xs-10">'+
'<eg-vol-row only-vols="onlyVols" record="{{record}}"'+
'ng-repeat="(cn,copies) in struct" '+
commit 317c2fdc537948af4da2999cbafb7c3f290dad3a
Author: a. bellenir <ab at grpl.org>
Date: Wed Jun 27 14:48:56 2018 -0400
LP1746536: cannot edit vol/call number in item status
spawnHoldingsEdit was disabling record summary by passing record_id: 0
this change will provided the record_id if exactly one record is selected.
behavior is unchanged if multiple records are selected.
Signed-off-by: a. bellenir <ab at grpl.org>
Signed-off-by: cesar velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Conflicts:
Open-ILS/web/js/ui/default/staff/circ/services/item.js
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index 3bb09b0..c39f038 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -732,18 +732,22 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
angular.forEach(items, function(i){
item_ids.push(i.id);
});
-
- egCore.net.request(
- 'open-ils.actor',
- 'open-ils.actor.anon_cache.set_value',
- null,
- 'edit-these-copies',
- {
- record_id: 0, // disables record summary
- copies: item_ids,
- raw: {},
- hide_vols : hide_vols,
- hide_copies : hide_copies
+
+ // provide record_id iff one record is selected.
+ // 0 disables record summary
+ var record_ids = service.gatherSelectedRecordIds(items);
+ var record_id = record_ids.length === 1 ? record_ids[0] : 0;
+ egCore.net.request(
+ 'open-ils.actor',
+ 'open-ils.actor.anon_cache.set_value',
+ null,
+ 'edit-these-copies',
+ {
+ record_id: record_id,
+ copies: item_ids,
+ raw: {},
+ hide_vols : hide_vols,
+ hide_copies : hide_copies
}).then(function(key) {
if (key) {
var url = egCore.env.basePath + 'cat/volcopy/' + key;
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/staff/cat/volcopy/t_edit.tt2 | 12 +++++---
.../web/js/ui/default/staff/cat/volcopy/app.js | 16 +++++-----
.../web/js/ui/default/staff/circ/services/item.js | 28 +++++++++++--------
3 files changed, 32 insertions(+), 24 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list