From 48cbac3ff8468cae92e2fa31280a84bd2ae2bc7c Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Thu, 28 Aug 2008 20:30:28 +0000
Subject: Modified startstop to return string rather than boolean.

git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1436 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 app/startstop-html.lsp | 4 ++--
 lib/modelfunctions.lua | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/startstop-html.lsp b/app/startstop-html.lsp
index 56404f9..acacec0 100644
--- a/app/startstop-html.lsp
+++ b/app/startstop-html.lsp
@@ -14,8 +14,8 @@
 <% if data.value.result then %>
 <DT>Previous action result</DT>
 <DD>
-<% if data.value.result.descr then %>
-<P CLASS='descr'><%= string.gsub(data.value.result.descr, "\n", "<BR>") %></P>
+<% if data.value.result.value ~= "" then %>
+<P CLASS='descr'><%= string.gsub(data.value.result.value, "\n", "<BR>") %></P>
 <% end if data.value.result.errtxt then %>
 <P CLASS='error'><%= string.gsub(data.value.result.errtxt, "\n", "<BR>") %></P>
 <% end end %>
diff --git a/lib/modelfunctions.lua b/lib/modelfunctions.lua
index 0e81d75..491bf0b 100644
--- a/lib/modelfunctions.lua
+++ b/lib/modelfunctions.lua
@@ -19,7 +19,7 @@ end
 function startstop_service(processname, action)
 	-- action is validated in daemoncontrol
 	local cmdresult,cmdmessage,cmderror,cmdaction = daemoncontrol.daemoncontrol(processname, action)
-	return cfe({ type="boolean", value=cmdresult, descr=cmdmessage, errtxt=cmderror, label="Start/Stop result" })
+	return cfe({ value=cmdmessage or "", errtxt=cmderror, label="Start/Stop result" })
 end
 
 function getstatus(processname, packagename, label)
-- 
cgit v1.2.3