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

[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  001edcb20b3b408e9df9f901169749e5585b8b26 (commit)
       via  1ea0735761cbece4a276d413759c046bef494d2d (commit)
      from  71a8adacf6a4711b0682e010ca275a9d1f2e85f8 (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 001edcb20b3b408e9df9f901169749e5585b8b26
Author: Jason Etheridge <jason at EquinoxInitiative.org>
Date:   Thu Jun 27 18:15:50 2019 -0400

    lp1790169 call compileSort after closing showColumnDialog
    
    or in other words, make Sort Priority work right away after configuring it
    
    Signed-off-by: Jason Etheridge <jason at EquinoxInitiative.org>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.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 c347e2e36f..1d5df7dea3 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -1216,6 +1216,13 @@ angular.module('egGridMod',
                             }
                             $dialogScope.ok = $dialogScope.cancel = function() {
                                 delete $scope.lastModColumn;
+                                if (grid.columnsProvider.hasSortableColumn()) {
+                                    // only refresh the grid if the user has the
+                                    // ability to modify the sort priorities.
+                                    grid.compileSort();
+                                    grid.offset = 0;
+                                    grid.collect();
+                                }
                                 $uibModalInstance.close()
                             }
                         }

commit 1ea0735761cbece4a276d413759c046bef494d2d
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Fri Sep 7 17:32:15 2018 -0400

    LP#1790169: ensure that the sort priority actually gets saved
    
    This is a WIP patch - there's still a problem with the saved
    sort priorities actually getting used when a grid is initalized.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Jason Etheridge <jason at EquinoxInitiative.org>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.ts b/Open-ILS/src/eg2/src/app/share/grid/grid.ts
index 600f815564..7835f454ab 100644
--- a/Open-ILS/src/eg2/src/app/share/grid/grid.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid.ts
@@ -321,7 +321,7 @@ export class GridColumnSet {
             const c: GridColumnPersistConf = {name : col.name};
             if (col.align !== 'left') { c.align = col.align; }
             if (col.flex !== 2) { c.flex = Number(col.flex); }
-            if (Number(col.sort)) { c.sort = Number(c.sort); }
+            if (Number(col.sort)) { c.sort = Number(col.sort); }
             return c;
         });
     }
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 8421cc11a2..c347e2e36f 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -256,6 +256,7 @@ angular.module('egGridMod',
                     // link columns to scope after loadConfig(), since it
                     // replaces the columns array.
                     $scope.columns = grid.columnsProvider.columns;
+                    grid.dataProvider.refresh();
                 });
 
                 // NOTE: grid.collect() is first called from link(), not here.
@@ -463,7 +464,7 @@ angular.module('egGridMod',
                     // No need to store col.visible, since that's implicit
                     if (col.align != 'left') c.align = col.align;
                     if (col.flex != 2) c.flex = col.flex;
-                    if (Number(col.sort)) c.sort = Number(c.sort);
+                    if (Number(col.sort)) c.sort = Number(col.sort);
                     return c;
                 });
 

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

Summary of changes:
 Open-ILS/src/eg2/src/app/share/grid/grid.ts       |  2 +-
 Open-ILS/web/js/ui/default/staff/services/grid.js | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS