[open-ils-commits] [GIT] Evergreen ILS branch master updated. 79fafc21338b69fbd8ec0f6b567f9dc47bb799bd

[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, master has been updated
       via  79fafc21338b69fbd8ec0f6b567f9dc47bb799bd (commit)
      from  dadadc1e76bd7a1d336595d5d3bec9351c646fe8 (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 79fafc21338b69fbd8ec0f6b567f9dc47bb799bd
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 2d2a2d8..c32cf6f 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);

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

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