From: Florian Eckert <fe@dev.tdt.de>
Date: Thu, 18 Jan 2018 12:42:21 +0000 (+0100)
Subject: luci-app-mwan3: refactoring detail status view and controller
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=406564c7db61f5e80bc246554488d7b04566d4cb;p=project%2Fluci.git

luci-app-mwan3: refactoring detail status view and controller

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
index e7e8dc93c8..69e72b7fdc 100644
--- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
+++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
@@ -68,16 +68,13 @@ function mwan_Status()
 end
 
 function detailedStatus()
-	local mArray = {}
-
-	-- detailed mwan status
-	local detailStatusInfo = ut.trim(sys.exec("/usr/sbin/mwan3 status"))
-	if detailStatusInfo ~= "" then
-		mArray.mwandetail = { detailStatusInfo }
+	local statusInfo = ut.trim(sys.exec("/usr/sbin/mwan3 status"))
+	luci.http.prepare_content("text/plain")
+	if statusInfo ~= "" then
+		luci.http.write(statusInfo)
+	else
+		luci.http.write("Unable to get status information")
 	end
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(mArray)
 end
 
 function diagnosticsData(interface, task)
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm
index 0ff2824ed2..4cb65dd2b1 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm
@@ -10,33 +10,23 @@
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 <script type="text/javascript">//<![CDATA[
 	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "detailed_status")%>', null,
-		function(x, mArray)
+		function(x)
 		{
-			var status = document.getElementById('mwan_detail_text');
-			if (mArray.mwandetail)
-			{
-				status.innerHTML = String.format('<pre>%s</pre>', mArray.mwandetail[0]);
-			}
-			else
-			{
-				status.innerHTML = '<strong><%:No detailed status information available%></strong>';
-			}
+			var legend = document.getElementById('diag-rc-legend');
+			var output = document.getElementById('diag-rc-output');
+			legend.style.display = 'none';
+			output.innerHTML = String.format('<pre>%h</pre>', x.responseText);
 		}
 	);
 //]]></script>
 
-<div id="mwan_detail_status">
+<div>
 	<fieldset class="cbi-section">
-		<legend><%:MWAN Detailed Status%></legend>
-		<div id="mwan_detail_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
+		<legend id="diag-rc-legend"><%:Collecting data...%></legend>
+		<span id="diag-rc-output">
+			<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align: middle;" />
+		</span>
 	</fieldset>
 </div>
 
-<style type="text/css">
-  #mwan_detail_text {
-	padding: 20px;
-	text-align: left;
-  }
-</style>
-
 <%+footer%>