From 79fafc21338b69fbd8ec0f6b567f9dc47bb799bd Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalystdevworks.com>
Date: Tue, 4 Oct 2016 15:55:23 -0700
Subject: [PATCH] LP#1537217 Precat Checkout Circ Modifier

Precat checkout in the browser client no longer
requires the use of a circ modifier(when circ
modifiers exist).  Similarly, no circ modifier
is chosen by default.

Signed-off-by: Kyle Huckins <khuckins@catalystdevworks.com>
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 Open-ILS/src/templates/staff/circ/share/t_precat_dialog.tt2 | 1 +
 Open-ILS/web/js/ui/default/staff/circ/services/circ.js      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/share/t_precat_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_precat_dialog.tt2
index fc14ec3cff..1410f9e806 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_precat_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_precat_dialog.tt2
@@ -29,6 +29,7 @@
           <label for="precat-circmod">[% l('Circulation Modifier') %]</label>
           <select class="form-control" id="precat-circmod" 
             ng-model="precatArgs.circ_modifier">
+            <option value=""></option>
             <option ng-repeat="mod in circModifiers" 
               value="{{mod.code()}}">{{mod.name()}}</option>
           </select>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 2d2a2d86ee..c32cf6f300 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -764,8 +764,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
                 function($scope, $uibModalInstance, circMods) {
                 $scope.focusMe = true;
                 $scope.precatArgs = {
-                    copy_barcode : params.copy_barcode,
-                    circ_modifier : circMods.length ? circMods[0].code() : null
+                    copy_barcode : params.copy_barcode
                 };
                 $scope.circModifiers = circMods;
                 $scope.ok = function(args) { $uibModalInstance.close(args) }
@@ -779,6 +778,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
         }).result.then(
             function(args) {
                 if (!args || !args.dummy_title) return $q.reject();
+                if(args.circ_modifier == "") args.circ_modifier = null;
                 angular.forEach(args, function(val, key) {params[key] = val});
                 params.precat = true;
                 return service.checkout(params, options);
-- 
2.43.2