tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove single selections correctly when going back in the history

This commit is contained in:
Matthias Jentsch 2015-07-28 15:21:14 +02:00
parent 8dbd671b0d
commit cbb9ef10a2
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/js/icinga/behavior/actiontable.js
View File

@ -397,6 +397,13 @@
$(container).find('.selection-info-count').text(table.selections().size()); $(container).find('.selection-info-count').text(table.selections().size());
}; };
ActionTable.prototype.clearAll = function () {
var self = this;
this.tables().each(function () {
new Selection(this, self.icinga).clear();
});
};
Icinga.Behaviors.ActionTable = ActionTable; Icinga.Behaviors.ActionTable = ActionTable;
}) (Icinga, jQuery); }) (Icinga, jQuery);

1
public/js/icinga/events.js
View File

@ -427,7 +427,6 @@
} else { } else {
icinga.ui.layout1col(); icinga.ui.layout1col();
} }
$('table tr[href].active').removeClass('active');
icinga.history.pushCurrentState(); icinga.history.pushCurrentState();
} }
} }

3
public/js/icinga/ui.js
View File

@ -241,6 +241,9 @@
$('#layout').removeClass('twocols'); $('#layout').removeClass('twocols');
this.closeContainer($('#col2')); this.closeContainer($('#col2'));
this.disableCloseButtons(); this.disableCloseButtons();
// one-column layouts never have any selection active
this.icinga.behaviors.actiontable.clearAll();
}, },
closeContainer: function($c) { closeContainer: function($c) {