[open-ils-commits] [GIT] Evergreen ILS branch rel_3_2 updated. 970c3027abb88335ae040566d679288a4bc0ec6e

[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, rel_3_2 has been updated
       via  970c3027abb88335ae040566d679288a4bc0ec6e (commit)
       via  c48be4fef45c1d5699a311d3e4837c68e985b099 (commit)
      from  db7f91ae2af87b79d65e19e1b659f823e2bb935f (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 970c3027abb88335ae040566d679288a4bc0ec6e
Author: Jason Stephenson <jason at sigio.com>
Date:   Mon Jan 14 14:43:50 2019 -0500

    Lp 1801998: Deprecate Hatch Storage Grammar Fix
    
    Make a minor fix to punctuation in a newly added message.
    
    Signed-off-by: John Amundson <jamundson at cwmars.org>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2
index eed2980..bec3bf2 100644
--- a/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2
@@ -27,7 +27,7 @@
     <div class="panel panel-danger">
       <div class="panel-heading">[% l('Storing settings in Hatch is deprecated') %]</div>
       <div class="panel-body">
-        [% l("If 'Store Local Settings in Hatch' is enabled.  Use the 'Copy Hatch Settings To Local Storage' button before disabling 'Store Local Settings in Hatch'") %]
+        [% l("If 'Store Local Settings in Hatch' is enabled, use the 'Copy Hatch Settings To Local Storage' button before disabling 'Store Local Settings in Hatch'") %]
       </div>
     </div>
   </div>

commit c48be4fef45c1d5699a311d3e4837c68e985b099
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Nov 6 15:06:19 2018 -0500

    LP#1801998 Deprecate Hatch for data storage
    
    Add a deprecation warning to the Hatch configuration page notifying
    users that Hatch for storage is deprecated.  Includes suggestions on how
    to migrate away from Hatch for storage.
    
    Remove the unusued "Use Hatch for Offline Files" option.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: John Amundson <jamundson at cwmars.org>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2
index 836c893..eed2980 100644
--- a/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_hatch.tt2
@@ -24,6 +24,15 @@
   </div>
 
   <div class="row new-entry">
+    <div class="panel panel-danger">
+      <div class="panel-heading">[% l('Storing settings in Hatch is deprecated') %]</div>
+      <div class="panel-body">
+        [% l("If 'Store Local Settings in Hatch' is enabled.  Use the 'Copy Hatch Settings To Local Storage' button before disabling 'Store Local Settings in Hatch'") %]
+      </div>
+    </div>
+  </div>
+
+  <div class="row new-entry">
     <div class="col-md-4">
       <div class="checkbox">
         <label>
@@ -34,29 +43,12 @@
       </div>
     </div>
     <div class="col-md-3">
-      <button class="btn btn-default" ng-click="copy_to_hatch()">
-        [% l('Copy Local Storage Settings To Hatch') %]
-      </button>
-    </div>
-    <div class="col-md-3">
       <button class="btn btn-default" ng-click="copy_to_local()">
         [% l('Copy Hatch Settings To Local Storage') %]
       </button>
     </div>
   </div>
 
-  <div class="row new-entry">
-    <div class="col-md-4">
-      <div class="checkbox">
-        <label>
-          <input type="checkbox" 
-            ng-model="hatch_offline">
-            [% l('Store Offline Transaction Data in Hatch') %]
-        </label>
-      </div>
-    </div>
-  </div>
-
 </div>
 
 

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

Summary of changes:
 .../templates/staff/admin/workstation/t_hatch.tt2  |   26 +++++++-------------
 1 files changed, 9 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Evergreen ILS