Merge branch 'bugfix/toggle-autorefresh-redirect-8605'

fixes #8605

application/forms/AutoRefreshForm.php

@@ -21,6 +21,8 @@ class AutoRefreshForm extends Form
     public function init()
     {
         $this->setName('form_auto_refresh');
+        // Post against the current location
+        $this->setAction('');
     }
 
     /**

library/Icinga/Web/Form.php

@@ -535,7 +535,13 @@ class Form extends Zend_Form
                 ->addCsrfCounterMeasure()
                 ->addSubmitButton();
 
-            if ($this->getAction() === '') {
+            if ($this->getAttrib('action') === null) {
+                // Use Form::getAttrib() instead of Form::getAction() here because we want to explicitly check against
+                // null. Form::getAction() would return the empty string '' if the action is not set.
+                // For not setting the action attribute use Form::setAction(''). This is required for for the
+                // accessibility's enable/disable auto-refresh mechanic
+
+                // TODO(el): Re-evalute this necessity. JavaScript could use the container's URL if there's no action set.
                 // We MUST set an action as JS gets confused otherwise, if
                 // this form is being displayed in an additional column
                 $this->setAction(Url::fromRequest()->without(array_keys($this->getElements())));

public/js/icinga/events.js

@@ -239,10 +239,8 @@
             event.stopPropagation();
             event.preventDefault();
 
-            icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
-
             if ($button.length) {
-                // activate spinner indicator
+                // Activate spinner
                 if ($button.hasClass('spinner')) {
                     $button.addClass('active');
                 }
@@ -252,6 +250,13 @@
                 $target = self.getLinkTargetFor($form);
             }
 
+            if (! url) {
+                // Use the URL of the target container if the form's action is not set
+                url = $target.closest('.container').data('icinga-url');
+            }
+
+            icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
+
             if (method === 'GET') {
                 var dataObj = $form.serializeObject();
 
@@ -274,6 +279,7 @@
                     }
                 }
             }
+
             icinga.loader.loadUrl(url, $target, data, method);
 
             return false;

public/js/icinga/loader.js

@@ -292,6 +292,12 @@
                 r.url = redirect;
                 if (parts.length) {
                     r.loadNext = parts;
+                } else if (!! document.location.hash) {
+                    // Retain detail URL if the layout is rerendered
+                    parts = document.location.hash.split('#!').splice(1);
+                    if (parts.length) {
+                        r.loadNext = parts;
+                    }
                 }
 
             } else {