From e3d527ba04a07224af093ccc182f953f088dd0d1 Mon Sep 17 00:00:00 2001 From: Michele Morgan Date: Wed, 21 Dec 2022 16:16:05 -0500 Subject: [PATCH] Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js - revert to stock Signed-off-by: Michele Morgan --- Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js | 12 ------------ 1 file changed, 12 deletions(-) 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 3ab4cbc26d..e0c9722f5f 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 @@ -1101,18 +1101,10 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore , } }; -<<<<<<< HEAD egCore.org.settings('cat.require_call_number_labels').then(function(res) { $scope.require_label = res['cat.require_call_number_labels']; }); -======= - egCore.org.settings('cat.require_call_number_labels').then( - function(res) { - $scope.require_label = res['cat.require_call_number_labels' - ]; - }); ->>>>>>> cd33336d7a (NOBLE client-side customizations) $scope.new_lib_to_add = egCore.org.get(egCore.auth.user().ws_ou()); $scope.changeNewLib = function (org) { $scope.new_lib_to_add = org; @@ -1813,11 +1805,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore , itemSvc.copies, function (i) { if (!$scope.only_vols) { -<<<<<<< HEAD if (i.duplicate_barcode || i.empty_barcode) { -======= - if (i.duplicate_barcode || i.empty_barcode || i.call_number().empty_label && $scope.require_label) { ->>>>>>> cd33336d7a (NOBLE client-side customizations) can_save = false; } if (i.call_number().empty_label && $scope.require_label) { -- 2.11.0