From 435160324318552e9cfa3333b457d2f471de8338 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 26 Feb 2015 14:48:37 +0100
Subject: [PATCH] Fix that editing an auth backend does not open the next
 column

---
 application/views/scripts/form/reorder-authbackend.phtml | 4 ++--
 public/js/icinga/events.js                               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/scripts/form/reorder-authbackend.phtml b/application/views/scripts/form/reorder-authbackend.phtml
index 02f62572d..c31443eb6 100644
--- a/application/views/scripts/form/reorder-authbackend.phtml
+++ b/application/views/scripts/form/reorder-authbackend.phtml
@@ -1,4 +1,4 @@
-<form data-base-target="_self" id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
+<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
   <table class="action">
     <thead>
       <th>Backend</th>
@@ -31,7 +31,7 @@
             )
           ); ?>
         </td>
-        <td>
+        <td data-base-target="_self">
 <?php if ($i > 0): ?>
           <button type="submit" name="backend_newpos" value="<?= sprintf(
             '%s|%s',
diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index 021b25f47..e4c1e54a0 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -233,7 +233,7 @@
 
             icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
 
-            $target = self.getLinkTargetFor($form);
+            $target = self.getLinkTargetFor($button);
 
             if (method === 'GET') {
                 var dataObj = $form.serializeObject();
@@ -558,8 +558,8 @@
             $(document).off('click', 'table.action tr[href]', this.rowSelected);
             $(document).off('click', 'table.action tr a', this.rowSelected);
             $(document).off('submit', 'form', this.submitForm);
-            $(document).off('click', 'button', this.submitForm);
             $(document).off('change', 'form select.autosubmit', this.submitForm);
+            $(document).off('change', 'form input.autosubmit', this.submitForm);
         },
 
         destroy: function() {