Display the rows in the auth backend configuration as active without …

…any delay refs #8623
Icinga · Jul 29, 2015 · 6db79a7 · 6db79a7
1 parent 3a85dc7
commit 6db79a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
@@ -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>

diff --git a/public/js/icinga/behavior/actiontable.js b/public/js/icinga/behavior/actiontable.js
@@ -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();