LP#1676608: remove legacy copy alerts field from vol/copy editor

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 3d60493..0af5072 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
@@ -98,7 +98,7 @@
             <b>[% l('Status') %]</b>
         </div>
         <div class="col-md-4">
-            <b>[% l('Copy Alert') %]</b>
+            <b>[% l('Statistical Categories') %]</b>
         </div>
     </div>
 
@@ -138,7 +138,6 @@
                 <div class="col-md-6">
                     <b>[% l('Reference?') %]</b>
                 </div>
-                
             </div>
 
             <div class="row">
@@ -422,33 +421,13 @@
         </div>
 
         <div class="col-md-4">
-            
-            <div class="row" >
-                <div class="col-xs-12">
-                    <div class="row">
-                        <div class="nullable col-xs-12">
-                            <input class="form-control" type="text" ng-model="working.alert_message"
-                                ng-disabled="!defaults.attributes.alert_message" placeholder="Alert message" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row pad-vert"></div>
             <div class="row">
                 <div class="col-xs-12">
-                    <div class="row bg-info">
-                        <div class="col-xs-12">
-                            <b>Statistical Categories</b>
-                        </div>
-                    </div>
-                    <div class="row">
-                           <select class="form-control" ng-disabled="!defaults.statcats"
-                               ng-model="working.statcat_filter"
-                               ng-options="o.id() as o.shortname() for o in statcat_filter_list">
-                             <option value="">[% l('Filter by Library') %]</option>
-                           </select>
-                    </div>
+                    <select class="form-control" ng-disabled="!defaults.statcats"
+                        ng-model="working.statcat_filter"
+                        ng-options="o.id() as o.shortname() for o in statcat_filter_list">
+                      <option value="">[% l('Filter by Library') %]</option>
+                    </select>
                 </div>
             </div>
 
@@ -474,7 +453,6 @@
                     </div>
                 </div>
             </div>
-
         </div>
 
     </div>

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 77316e6..d1c1f0e 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
@@ -102,9 +102,8 @@
                 </div>
                 <div class="col-xs-6">
                     <label>
-                        <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alert_message"/>
-                        <!-- <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alerts"/> -->
-                        [% l('Alert Message') %]
+                        <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alerts"/>
+                        [% l('Alerts') %]
                     </label>
                 </div>
             </div>

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 03cde64..b15c551 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
@@ -946,8 +946,7 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
             location : true,
             holdable : true,
             age_protect : true,
-            floating : true,
-            alert_message : true
+            floating : true
         }
     };
 
@@ -1746,7 +1745,6 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
         createSimpleUpdateWatcher('mint_condition');
         createSimpleUpdateWatcher('opac_visible');
         createSimpleUpdateWatcher('ref');
-        createSimpleUpdateWatcher('alert_message');
 
         $scope.saveCompletedCopies = function (and_exit) {
             var cnHash = {};
@@ -2534,7 +2532,6 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                 createSimpleUpdateWatcher('mint_condition');
                 createSimpleUpdateWatcher('opac_visible');
                 createSimpleUpdateWatcher('ref');
-                createSimpleUpdateWatcher('alert_message');
 
                 $scope.suffix_list = [];
                 itemSvc.get_suffixes(egCore.auth.user().ws_ou()).then(function(list){