diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2012-11-24 03:14:58 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2012-11-24 03:14:58 +0000 |
| commit | 9ee1cd6513567c457cee79203df7b4cc682d0432 (patch) | |
| tree | 32893494a9c3da10823cdbe1a222164368418b5d | |
| parent | ee5cf20d981be9271455eb115bb3204f46e16453 (diff) | |
| download | acf-weblog-9ee1cd6513567c457cee79203df7b4cc682d0432.tar.bz2 acf-weblog-9ee1cd6513567c457cee79203df7b4cc682d0432.tar.xz | |
Fixed downloadadhocquery and cleaned up use of viewtype
| -rw-r--r-- | weblog-adhocquery-html.lsp | 1 | ||||
| -rw-r--r-- | weblog-controller.lua | 6 | ||||
| -rw-r--r-- | weblog-viewweblog-html.lsp | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/weblog-adhocquery-html.lsp b/weblog-adhocquery-html.lsp index 38641a9..1a20f02 100644 --- a/weblog-adhocquery-html.lsp +++ b/weblog-adhocquery-html.lsp @@ -37,6 +37,7 @@ html = require("acf.html") <% if viewlibrary.check_permission("downloadadhocquery") then %> <form action="/cgi-bin/acf/weblog/weblog/downloadadhocquery" method="POST"> <input class="hidden" type="hidden" name="query" value="<%= html.html_escape(form.value.query.value) %>" > + <input class="hidden" type="hidden" name="viewtype" value="stream" > <DL> <DT>Download query result</DT><DD><input class="submit" type="submit" name="submit" value="Download"></DD> </DL> diff --git a/weblog-controller.lua b/weblog-controller.lua index a58bb2c..1b6f09b 100644 --- a/weblog-controller.lua +++ b/weblog-controller.lua @@ -45,7 +45,6 @@ function viewweblog(self) end function downloadweblog(self) - self.conf.viewtype = "stream" local retval = viewweblog(self) local file = cfe({ type="longtext", value="", label="Weblog-"..os.date()..".tab" }) local content = {"sourcename\tclientuserid\tclientip\tlogdatetime\turi\tbytes\treason\tscore\tshortreason\tbadyesno\tdeniedyesno\tbypassyesno"} @@ -82,10 +81,9 @@ function adhocquery(self) end function downloadadhocquery(self) - self.conf.viewtype = "stream" - local retval = self.model.getnewadhocquery() + local retval = self.model.getnewadhocquery(self, self.clientdata) self.handle_clientdata(retval, self.clientdata) - retval = self.model.adhocquery(retval) + retval = self.model.adhocquery(self, retval) local file = cfe({ type="longtext", value="", label="weblogadhocquery.tab" }) if retval.value.result and #retval.value.result.value > 0 then diff --git a/weblog-viewweblog-html.lsp b/weblog-viewweblog-html.lsp index d727f84..64761a6 100644 --- a/weblog-viewweblog-html.lsp +++ b/weblog-viewweblog-html.lsp @@ -209,6 +209,7 @@ data.option = "Download" data.value.log = nil data.value.window = nil data.value.focus = nil +data.value.viewtype = cfe({ value="stream" }) for n,v in pairs(data.value) do v.type = "hidden" v.checked = nil |