[open-ils-commits] [GIT] Evergreen ILS branch rel_2_10 updated. ace9b1e5cfb2105ecbfae7b22f2472422b16ab1a

[Evergreen Git]

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, rel_2_10 has been updated
       via  ace9b1e5cfb2105ecbfae7b22f2472422b16ab1a (commit)
      from  fbf20f9ef105ee55a526f90f105bc7667ed76bd8 (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 ace9b1e5cfb2105ecbfae7b22f2472422b16ab1a
Author: Kyle Huckins <khuckins at catalystdevworks.com>
Date:   Tue Oct 4 15:55:23 2016 -0700

    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 at catalystdevworks.com>
    Signed-off-by: Christine Burns <christine.burns at bc.libraries.coop>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

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 fc14ec3..1410f9e 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 2ff641b..590d7fc 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
@@ -717,8 +717,7 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
                 function($scope, $modalInstance, 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) { $modalInstance.close(args) }
@@ -732,6 +731,7 @@ function($modal , $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);

-----------------------------------------------------------------------

Summary of changes:
 .../templates/staff/circ/share/t_precat_dialog.tt2 |    1 +
 .../web/js/ui/default/staff/circ/services/circ.js  |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS