summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Schulthess2017-02-10 12:20:15 +0100
committerChristoph Schulthess2017-02-10 12:20:15 +0100
commite9fe067248bb135f56958d7df3e38203a7c338c1 (patch)
treee3c93cb3b6e7c7456924de25c32a9a58d380c5ed
parentadapted debugrequest.php (diff)
downloadslx-admin-e9fe067248bb135f56958d7df3e38203a7c338c1.tar.gz
slx-admin-e9fe067248bb135f56958d7df3e38203a7c338c1.tar.xz
slx-admin-e9fe067248bb135f56958d7df3e38203a7c338c1.zip
working on taskstatus
-rw-r--r--modules-available/debugconfig/page.inc.php3
-rw-r--r--modules-available/debugconfig/templates/debugconfig.html1
2 files changed, 4 insertions, 0 deletions
diff --git a/modules-available/debugconfig/page.inc.php b/modules-available/debugconfig/page.inc.php
index 04ce6793..ea78e3c5 100644
--- a/modules-available/debugconfig/page.inc.php
+++ b/modules-available/debugconfig/page.inc.php
@@ -24,6 +24,9 @@ class Page_debugConfig extends Page
{
$debug_config = $this->getConfig();
Render::addTemplate('debugconfig', array("debugEnabled" => $debug_config["enabled"], "debugServer" => $debug_config["debugServer"], "port" => $debug_config["port"]));
+ $taskid = Taskmanager::isTask("DispatchRelay");
+ if ($taskid !== Null )
+ Render::addTemplate('relaystatus', array("taskid" => $taskid))
}
private function getConfig()
diff --git a/modules-available/debugconfig/templates/debugconfig.html b/modules-available/debugconfig/templates/debugconfig.html
index 83ea0449..4e5353b5 100644
--- a/modules-available/debugconfig/templates/debugconfig.html
+++ b/modules-available/debugconfig/templates/debugconfig.html
@@ -24,6 +24,7 @@
<span class="glyphicon glyphicon-question-sign"></span>
</a>
</div>
+
<div class="modal fade" id="help-remoteDebugging" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">