LP#1676608: tweak defaults for alerts in vol/copy editor

Changed the defaults key for new-style copy alerts to be the same
as what was used for legacy copy alert messages; this means that
users who set editor defaults prior to upgrading are more likely
to have the Copy Alerts button be active out of the box.

Also moved the location of Add/Edit Copy Alerts in the defaults
tab.

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index 0af5072..5bdf826 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -385,7 +385,7 @@
                     </button>
                     <button
                       class="btn btn-default"
-                      ng-disabled="!defaults.copy_alerts"
+                      ng-disabled="!defaults.attributes.alerts"
                       ng-click="copy_alerts_dialog(workingGridControls.selectedItems())"
                       type="button">
                         [% l('Copy Alerts') %]

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
index d1c1f0e..9430b6c 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
@@ -103,7 +103,7 @@
                 <div class="col-xs-6">
                     <label>
                         <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alerts"/>
-                        [% l('Alerts') %]
+                        [% l('Add/Edit Copy Alerts') %]
                     </label>
                 </div>
             </div>
@@ -310,14 +310,6 @@
                 </div>
             </div>
 
-            <div class="row">
-                <div class="col-xs-6">
-                    <label>
-                        <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.copy_alerts"/>
-                        [% l('Add/Edit Copy Alerts') %]
-                    </label>
-                </div>
-            </div>
         </div>
 
         <div class="col-md-4">

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 b15c551..dcf9792 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
@@ -926,7 +926,6 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
         statcats : true,
         copy_notes : true,
         copy_tags : true,
-        copy_alerts : true,
         attributes : {
             status : true,
             loan_duration : true,
@@ -946,7 +945,8 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
             location : true,
             holdable : true,
             age_protect : true,
-            floating : true
+            floating : true,
+            alerts : true
         }
     };