Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HPCC-21890 IE crash while monitoring running WU #12466

Merged
merged 1 commit into from Apr 18, 2019
Merged

HPCC-21890 IE crash while monitoring running WU #12466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions esp/src/eclwatch/DFUQueryWidget.js
View file
Open in desktop
Expand Up @@ -346,27 +346,27 @@ define([

// Implementation ---
getFilter: function () {
if (this.workunitsGrid){
if (this.workunitsGrid) {
var retVal = this.filter.toObject();
if (retVal.Sortby){
switch (retVal.Sortby){
if (retVal.Sortby) {
switch (retVal.Sortby) {
case "Smallest":
this.workunitsGrid.set ("sort", [{ attribute: "FileSize", "descending": false }]);
this.workunitsGrid.updateSortArrow([{ attribute: "IntSize", "descending": false }]);
break;
case "Largest":
this.workunitsGrid.set ("sort", [{ attribute: "FileSize", "descending": true }]);
this.workunitsGrid.updateSortArrow([{ attribute: "IntSize", "descending": true }]);
break;
case "Oldest":
this.workunitsGrid.set ("sort", [{ attribute: "Modified", "descending": false }]);
this.workunitsGrid.updateSortArrow([{ attribute: "Modified", "descending": false }]);
break;
case "Newest":
/* falls through */
/* falls through */
default:
this.workunitsGrid.set ("sort", [{ attribute: "Modified", "descending": true }]);
this.workunitsGrid.updateSortArrow([{ attribute: "Modified", "descending": true }]);
break;
}
}
}
}
var retVal = this.filter.toObject();
if (retVal.StartDate && retVal.FromTime) {
lang.mixin(retVal, {
Expand Down
19 changes: 6 additions & 13 deletions esp/src/src/ESPUtil.ts
View file
Open in desktop
Expand Up @@ -297,29 +297,22 @@ export var LocalStorage = dojo.declare([Evented], {

export function goToPageUserPreference(gridName, key) {
var context = this;
var inGotoPage;
var initUserPref = this.LocalStorage.prototype.getItem(key, "Number");
if (initUserPref) {
gridName.set("rowsPerPage", initUserPref);
gridName.rowsPerPage = initUserPref;
gridName._updateRowsPerPageOption();
}
aspect.after(gridName, 'gotoPage', function (deferred, args) {
return deferred.then(function () {
if (!inGotoPage) {
var currentUserPref = context.LocalStorage.prototype.getItem(key, "Number");
var currentGridValue = gridName.rowsPerPage;
if (currentUserPref !== currentGridValue) {
inGotoPage = true;
context.LocalStorage.prototype.setItem(key, currentGridValue);
gridName.set("rowsPerPage", currentGridValue);
return;
}
var currentUserPref = context.LocalStorage.prototype.getItem(key, "Number");
var currentGridValue = gridName.rowsPerPage;
if (currentUserPref !== currentGridValue) {
context.LocalStorage.prototype.setItem(key, currentGridValue);
}
inGotoPage = false;
});
});
}


export var MonitorLockClick = dojo.declare([Evented], {
unlocked: function () {
this.emit("unlocked", {});
Expand Down