Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js - revert to stock

Signed-off-by: Michele Morgan <mmorgan@noblenet.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 3ab4cbc..e0c9722 100644 (file)
--- 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) {