LP#1402797 Separate stock and custom penalty type models

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>

diff --git a/Open-ILS/src/templates/staff/circ/share/t_new_message_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_new_message_dialog.tt2
index 420c358..a656e38 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/share/t_new_message_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_new_message_dialog.tt2
@@ -23,10 +23,10 @@
           </ul>
         </div>
         <div class="col-md-4 pull-right">
-          <select class="form-control" ng-model="args.penalty">
-            <option ng-selected="args.penalty = ''" value="">[% l('Penalty Type') %]</option>
+          <select class="form-control" ng-model="args.custom_penalty">
+            <option disabled="disabled" ng-selected="args.custom_penalty = ''" value="">[% l('Penalty Type') %]</option>
             <option ng-repeat="penalty in penalties" 
-              ng-selected="args.penalty = penalty.id"
+              ng-selected="args.custom_penalty = penalty.id"
               value="{{penalty.id()}}">{{penalty.label()}}</option>
           </select>
         </div>

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 edf975a..9a0b8a7 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -1440,7 +1440,11 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
                 pen.usr(user_id);
                 pen.org_unit(egCore.auth.user().ws_ou());
                 pen.note(args.note);
-                pen.standing_penalty(args.penalty);
+                if (args.custom_penalty) {
+                    pen.standing_penalty(args.custom_penalty);
+                } else {
+                    pen.standing_penalty(args.penalty);
+                }
                 pen.staff(egCore.auth.user().id());
                 pen.set_date('now');
                 return egCore.pcrud.create(pen);