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

Display the rows in the auth backend configuration as active without any delay 

refs #8623
This commit is contained in:
Matthias Jentsch 2015-07-29 15:10:32 +02:00
parent 3a85dc7f39
commit 6db79a72d5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/views/scripts/form/reorder-authbackend.phtml
View File

@ -16,7 +16,8 @@
array('backend' => $backendNames[$i]),
array(
'icon' => 'edit',
'title' => sprintf($this->translate('Edit user backend %s'), $backendNames[$i])
'class' => 'rowaction',
'title' => sprintf($this->translate('rEdit user backend %s'), $backendNames[$i])
)
); ?>
</td>

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

@ -313,13 +313,16 @@
*/
ActionTable.prototype.onRowClicked = function (event) {
var self = event.data.self;
var $tr = $(event.target).closest('tr');
var $target = $(event.target);
var $tr = $target.closest('tr');
var table = new Selection($tr.closest('table.action')[0], self.icinga);
// allow form actions in table rows to pass through
if ($(event.target).closest('form').length) {
// some rows may contain form actions that trigger a different action, pass those through
if (!$target.hasClass('rowaction') && $target.closest('form').length &&
($target.closest('a').length || $target.closest('button').length)) {
return;
}
event.stopPropagation();
event.preventDefault();