runner: all runner webpages do not redirect to viewLog on Build&Run

97a0b5be · Nicolas Wavrant · efad6d9c · 97a0b5be
Commit 97a0b5be authored Feb 11, 2014 by Nicolas Wavrant
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

slapos/runner/static/js/scripts/process.js slapos/runner/static/js/scripts/process.js +4 -2

No files found.
--- a/slapos/runner/static/js/scripts/process.js
+++ b/slapos/runner/static/js/scripts/process.js
@@ -130,7 +130,8 @@ function bindRun() {
        } else {
            if (!isRunning()) {
                setCookie("slapgridCMD", "Software");
-                window.location.href = $SCRIPT_ROOT + "/viewLog";
+                if (window.location.pathname === "/viewLog")
+                     window.location.href = $SCRIPT_ROOT + "/viewLog";
            }
        }
        return false;
@@ -141,7 +142,8 @@ function bindRun() {
        } else {
            if (!isRunning()) {
                setCookie("slapgridCMD", "Instance");
-                window.location.href = $SCRIPT_ROOT + "/viewLog";
+                if (window.location.pathname === "/viewLog")
+                     window.location.href = $SCRIPT_ROOT + "/viewLog";
            }
        }
        return false;