From 7bf929c46bdbce5b02a7adbafaf3939e48889d5c Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Mon, 29 Jan 2018 16:37:15 -0500
Subject: [PATCH] LP#1707063: Naive ng-class test for last-column-modified
Instead of comparing a (potentially undefined) property of a column, we'll
just compare the column object directly when checking to see if a column
header should be highlighted for "last touched in editing mode."
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Cesar Velez <cesar.velez@equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
Open-ILS/src/templates/staff/share/t_autogrid.tt2 | 2 +-
Open-ILS/web/js/ui/default/staff/services/grid.js | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index 4a91d0ccef..0519012098 100644
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -230,7 +230,7 @@
</div>
<div class="eg-grid-cell"
eg-grid-column-drag-dest
- ng-class="{'eg-grid-column-last-mod' : lastModColumn==col.name}"
+ ng-class="{'eg-grid-column-last-mod' : isLastModifiedColumn(col)}"
column="{{col.name}}"
eg-right-click="onContextMenu($event)"
ng-repeat="col in columns"
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 fc3a05b322..15d61f281d 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -765,10 +765,16 @@ angular.module('egGridMod',
column.flex = 1;
}
$scope.modifyColumnFlex = function(col, val) {
- $scope.lastModColumn = col.name;
+ $scope.lastModColumn = col;
grid.modifyColumnFlex(col, val);
}
+ $scope.isLastModifiedColumn = function(col) {
+ if ($scope.lastModColumn)
+ return $scope.lastModColumn === col;
+ return false;
+ }
+
grid.modifyColumnPos = function(col, diff) {
var srcIdx, targetIdx;
angular.forEach(grid.columnsProvider.columns,
@@ -801,7 +807,7 @@ angular.module('egGridMod',
}
$scope.modifyColumnPos = function(col, diff) {
- $scope.lastModColumn = col.name;
+ $scope.lastModColumn = col;
return grid.modifyColumnPos(col, diff);
}
--
2.11.0