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

[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  ca88dba7df64d06dff42f40261b0b28cfbb2129f (commit)
      from  7ecad6ebfa9afdda7355ae091dddf99073103f26 (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 ca88dba7df64d06dff42f40261b0b28cfbb2129f
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Thu Oct 12 17:31:37 2017 -0400

    LP#1719967 - Add alert message field to volcopy editor
    
    As 1676608 was deferred to 3.1, this adds a copy alert_message
    field, to the volcopy editor. The defaults tab "Alerts" checkbox has
    been replaced by "Alert Message" and this new field will be active until replaced by
    the changes of 3.1.
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    
    Signed-off-by: Mike Rylander <mrylander at 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 1d01491..bba9ab1 100644
--- 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('Statistical Categories') %]</b>
+            <b>[% l('Copy Alert') %]</b>
         </div>
     </div>
 
@@ -138,6 +138,7 @@
                 <div class="col-md-6">
                     <b>[% l('Reference?') %]</b>
                 </div>
+                
             </div>
 
             <div class="row">
@@ -414,13 +415,33 @@
         </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">
-                    <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 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>
                 </div>
             </div>
 
@@ -446,6 +467,7 @@
                     </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 c3cc46c..89e4ebe 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
@@ -102,8 +102,9 @@
                 </div>
                 <div class="col-xs-6">
                     <label>
-                        <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alerts"/>
-                        [% l('Alerts') %]
+                        <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') %]
                     </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 11fa2a7..a0ddade 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -843,7 +843,8 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
             location : true,
             holdable : true,
             age_protect : true,
-            floating : true
+            floating : true,
+            alert_message : true
         }
     };
 
@@ -1586,6 +1587,7 @@ 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 = {};
@@ -2162,6 +2164,7 @@ 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){

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

Summary of changes:
 .../templates/staff/cat/volcopy/t_attr_edit.tt2    |   34 ++++++++++++++++---
 .../src/templates/staff/cat/volcopy/t_defaults.tt2 |    5 ++-
 .../web/js/ui/default/staff/cat/volcopy/app.js     |    5 ++-
 3 files changed, 35 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Evergreen ILS