summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2010-04-07 14:22:33 +0000
committerTed Trask <ttrask01@yahoo.com>2010-04-07 14:22:33 +0000
commite0e0af703b2b68f7a70334f0150f0c80bc69be9e (patch)
tree23243066ca3936e76a40328ace1edc4ef13899f4
parentf34b36531959c92248da93db8151d9a5c393a293 (diff)
downloadacf-did-e0e0af703b2b68f7a70334f0150f0c80bc69be9e.tar.bz2
acf-did-e0e0af703b2b68f7a70334f0150f0c80bc69be9e.tar.xz
Modified description to be multiple line, and modified viewactivitylog to display lines.
-rw-r--r--did-model.lua6
-rw-r--r--did-viewactivitylog-html.lsp2
2 files changed, 4 insertions, 4 deletions
diff --git a/did-model.lua b/did-model.lua
index d817a37..6ee4049 100644
--- a/did-model.lua
+++ b/did-model.lua
@@ -650,7 +650,7 @@ local describechange = function(olddef, newdef)
end
if #changes > 0 then
- return table.concat(changes, " ")
+ return table.concat(changes, "\n")
else
return nil
end
@@ -677,7 +677,7 @@ local describeruleschange = function(oldrules, newrules)
end
if #changes > 0 then
- return table.concat(changes, " ")
+ return table.concat(changes, "\n")
else
return nil
end
@@ -856,7 +856,7 @@ function savedefinition(defin, test, exists)
updaterules(defin.value.did.value, rules)
descr[#descr+1] = describeruleschange(oldrules, listrules(definition.did))
if #descr > 0 then
- defin.descr = defin.descr..table.concat(descr, " ")
+ defin.descr = defin.descr..table.concat(descr, "\n")
logme(defin.descr)
elseif exists then
defin.descr = defin.descr.." no change"
diff --git a/did-viewactivitylog-html.lsp b/did-viewactivitylog-html.lsp
index 6499c7a..9881f27 100644
--- a/did-viewactivitylog-html.lsp
+++ b/did-viewactivitylog-html.lsp
@@ -10,7 +10,7 @@
<% for i,log in ipairs(data.value) do %>
<TR>
<TD><%= html.html_escape(log.logdatetime) %></TD>
- <TD><%= html.html_escape(log.msgtext) %></TD>
+ <TD><%= string.gsub(html.html_escape(log.msgtext), "\n", "<BR>") %></TD>
<TD><%= html.html_escape(log.userid) %></TD>
</TR>
<% end %>