[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1c061dd30a02a03bfe9d8043057b28e87aa910b2
Evergreen Git
git at git.evergreen-ils.org
Fri Mar 8 18:14:14 EST 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 1c061dd30a02a03bfe9d8043057b28e87aa910b2 (commit)
via 86bd68a432c60d14c766288b21cf130e956bf84d (commit)
from dcc170680f1847f6edacc788a425651eaff6fafd (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 1c061dd30a02a03bfe9d8043057b28e87aa910b2
Author: Remington Steed <rjs7 at calvin.edu>
Date: Fri Mar 8 15:27:45 2019 -0500
LP1793196 Fix console error when none selected
If you open the dropdown and close it without selecting anything, the
console shows an error complaining that $scope.selected is undefined.
This commit checks that it exists in that case before using it.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js
index 59ff1c8414..0fe9918e37 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -982,7 +982,7 @@ function($uibModal , $interpolate , egCore) {
$scope.isopen = $scope.clickedopen || ($filter('filter')(
$scope.list,
$scope.selected
- ).length > 0 && $scope.selected.length > 0);
+ ).length > 0 && $scope.selected && $scope.selected.length > 0);
if ($scope.clickedclosed) {
$scope.isopen = false;
$scope.clickedclosed = null;
commit 86bd68a432c60d14c766288b21cf130e956bf84d
Author: Bill Erickson <berickxx at gmail.com>
Date: Tue Feb 5 12:28:15 2019 -0500
LP1793196 Volume batch editor offers MARC call numbers
Provide call numbers extracted from the MARC record as options in the
volume batch editor. Call numbers to extract are based on the load-time
classification scheme, defaulting to Generic ('1') if no default scheme
is applied.
Patch includes additional sanity checks on volume editor utility
functions to avoid console errors referencing undefined values.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
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 e62e1b2622..c85ffbc4fd 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -25,7 +25,7 @@
<select class="form-control" ng-model="batch.prefix" ng-options="p.id() as p.label() for p in prefix_list"></select>
</div>
<div class="col-xs-2">
- <input class="form-control" type="text" ng-model="batch.label"/>
+ <eg-basic-combo-box list="batch.marcCallNumbers" selected="batch.label"></eg-basic-combo-box>
</div>
<div class="col-xs-1">
<select class="form-control" ng-model="batch.suffix" ng-options="s.id() as s.label() for s in suffix_list"></select>
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 4b74018aa0..76e637a163 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
@@ -1064,9 +1064,23 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
if ($scope.defaults.barcode_checkdigit) itemSvc.barcode_checkdigit = true;
if ($scope.defaults.auto_gen_barcode) itemSvc.auto_gen_barcode = true;
}
+
+ // Fetch the list of bib-level callnumbers based on the applied
+ // classification scheme. If none is defined, default to "1"
+ // (Generic) since it provides the most options.
+ egCore.net.request(
+ 'open-ils.cat',
+ 'open-ils.cat.biblio.record.marc_cn.retrieve',
+ $scope.record_id,
+ $scope.batch.classification || 1
+ ).then(function(list) {
+ $scope.batch.marcCallNumbers = [];
+ list.forEach(function(hash) {
+ $scope.batch.marcCallNumbers.push(Object.values(hash)[0]);
+ });
+ });
});
}
- $scope.fetchDefaults();
$scope.$watch('defaults.statcat_filter', function() {
$scope.saveDefaults();
@@ -1471,7 +1485,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
}
$scope.circTypeValue = function (x) {
- if (x === null) return egCore.strings.UNSET;
+ if (x === null || x === undefined) return egCore.strings.UNSET;
var s = $scope.circ_type_list.filter(function(y) {
return y.code() == x;
});
@@ -1480,7 +1494,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
}
$scope.ageprotectName = function (x) {
- if (x === null) return egCore.strings.UNSET;
+ if (x === null || x === undefined) return egCore.strings.UNSET;
var s = $scope.age_protect_list.filter(function(y) {
return y.id() == x;
});
@@ -1489,7 +1503,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
}
$scope.floatingName = function (x) {
- if (x === null) return egCore.strings.UNSET;
+ if (x === null || x === undefined) return egCore.strings.UNSET;
var s = $scope.floating_list.filter(function(y) {
return y.id() == x;
});
@@ -1498,7 +1512,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
}
$scope.circmodName = function (x) {
- if (x === null) return egCore.strings.UNSET;
+ if (x === null || x === undefined) return egCore.strings.UNSET;
var s = $scope.circ_modifier_list.filter(function(y) {
return y.code() == x;
});
@@ -1521,6 +1535,9 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
$scope.record_id = data.record_id;
+ // Fetch defaults
+ $scope.fetchDefaults();
+
function fetchRaw () {
if (!$scope.only_vols) $scope.dirty = true;
$scope.add_vols_copies = true;
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/staff/cat/volcopy/t_edit.tt2 | 2 +-
.../web/js/ui/default/staff/cat/volcopy/app.js | 27 ++++++++++++++++++----
Open-ILS/web/js/ui/default/staff/services/ui.js | 2 +-
3 files changed, 24 insertions(+), 7 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list