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

Evergreen Git git at git.evergreen-ils.org
Wed Sep 10 17:10:30 EDT 2014


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  35b8ce21a7785706c3a2ffd0c0c930542b923c64 (commit)
      from  a6e01ccfec6134ae938372f4700ec39685b47849 (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 35b8ce21a7785706c3a2ffd0c0c930542b923c64
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Sep 9 14:39:51 2014 -0400

    LP#1350042 grid print CSV repair; all cols repair
    
    * repaired grid Print CSV action, which had not been updated with the
      latest print API.
    
    * repair grid show/hide all columns actions.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js
index a554e93..2dca409 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -263,11 +263,15 @@ angular.module('egGridMod',
             }
 
             $scope.showAllColumns = function() {
+                $scope.gridColumnPickerIsOpen = false;
                 grid.columnsProvider.showAllColumns();
+                if (grid.selfManagedData) grid.collect();
             }
 
             $scope.hideAllColumns = function() {
+                $scope.gridColumnPickerIsOpen = false;
                 grid.columnsProvider.hideAllColumns();
+                // note: no need to fetch new data if no columns are visible
             }
 
             $scope.toggleColumnVisibility = function(col) {
@@ -705,8 +709,11 @@ angular.module('egGridMod',
 
             $scope.printCSV = function() {
                 $scope.gridColumnPickerIsOpen = false;
-                egCore.hatch.print('default', 'text/plain', grid.generateCSV())
-                .then(function() { console.debug('print complete') });
+                egCore.print.print({
+                    context : 'default', 
+                    content : grid.generateCSV(),
+                    content_type : 'text/plain'
+                });
             }
 
             // generates CSV for the currently visible grid contents
@@ -925,19 +932,15 @@ angular.module('egGridMod',
         }
 
         cols.showAllColumns = function() {
-            $scope.gridColumnPickerIsOpen = false;
             angular.forEach(cols.columns, function(column) {
                 column.visible = true;
             });
-            if (grid.selfManagedData) grid.collect();
         }
 
         cols.hideAllColumns = function() {
-            $scope.gridColumnPickerIsOpen = false;
             angular.forEach(cols.columns, function(col) {
                 delete col.visible;
             });
-            // note: no need to fetch new data if no columns are visible
         }
 
         cols.indexOf = function(name) {

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/services/grid.js |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list