GUI -- Bug fixes - TableModel displays empty cell instead of causing NPE if no value is given. Sort icons and direction are reset when view is destroyed.
Change-Id: Ib56527e4d523fabf846ffb9f948a6ead99280a4b
diff --git a/web/gui/src/main/webapp/app/fw/widget/table.js b/web/gui/src/main/webapp/app/fw/widget/table.js
index b4b1e4c..b2e1cc8 100644
--- a/web/gui/src/main/webapp/app/fw/widget/table.js
+++ b/web/gui/src/main/webapp/app/fw/widget/table.js
@@ -133,7 +133,7 @@
};
}
- function resetSortIcons() {
+ function resetSort() {
if (currCol.div) {
sortIconAPI.sortNone(currCol.div);
}
@@ -219,7 +219,7 @@
sortIconAPI = is.sortIcons();
return {
- resetSortIcons: resetSortIcons
+ resetSort: resetSort
};
}]);
diff --git a/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js b/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js
index 611e371..ef3fd66 100644
--- a/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js
+++ b/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js
@@ -63,7 +63,7 @@
function refresh() {
$log.debug('Refreshing ' + root + ' page');
- ts.resetSortIcons();
+ ts.resetSort();
sortCb();
}
o.scope.refresh = refresh;
@@ -74,6 +74,7 @@
// Cleanup on destroyed scope
o.scope.$on('$destroy', function () {
wss.unbindHandlers(handlers);
+ ts.resetSort();
});
sortCb();