diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2013-01-09 17:16:18 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2013-01-09 17:16:18 +0000 |
| commit | 879f60162d72c36ef3e28e2a81499fe4322b81f0 (patch) | |
| tree | 0abf9ece640a54e4709e54000cac88ba9c758e11 | |
| parent | 93dcca992f6b2b8f4ee25939142c912ea4fa666f (diff) | |
| download | acf-alpine-baselayout-879f60162d72c36ef3e28e2a81499fe4322b81f0.tar.bz2 acf-alpine-baselayout-879f60162d72c36ef3e28e2a81499fe4322b81f0.tar.xz | |
logfiles: change view, tail, and download to take filename instead of name parameter
| -rw-r--r-- | logfiles-controller.lua | 4 | ||||
| -rw-r--r-- | logfiles-status-html.lsp | 6 | ||||
| -rw-r--r-- | logfiles-tail-html.lsp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/logfiles-controller.lua b/logfiles-controller.lua index a90afec..dcaa12d 100644 --- a/logfiles-controller.lua +++ b/logfiles-controller.lua @@ -14,7 +14,7 @@ delete = function (self) end view = function (self) - return self.model.get_filedetails(self.clientdata.name or "", self.clientdata.grep) + return self.model.get_filedetails(self.clientdata.filename or "", self.clientdata.grep) end download = function (self) @@ -25,5 +25,5 @@ download = function (self) end tail = function (self) - return self.model.tail(self.clientdata.name, self.clientdata.offset, self.clientdata.grep) + return self.model.tail(self.clientdata.filename, self.clientdata.offset, self.clientdata.grep) end diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp index 2fdab82..db1122c 100644 --- a/logfiles-status-html.lsp +++ b/logfiles-status-html.lsp @@ -29,9 +29,9 @@ <%= html.link{value = "delete?filename="..file.value.filename.value.."&submit=true", label="Delete" } %> <% end %></TD> <% end %> - <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "view?name="..file.value.filename.value, label="View" } %></TD> - <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "tail?name="..file.value.filename.value, label="Tail" } %></TD> - <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "download?viewtype=stream&name="..file.value.filename.value, label="Download" } %></TD> + <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "view?filename="..file.value.filename.value, label="View" } %></TD> + <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "tail?filename="..file.value.filename.value, label="Tail" } %></TD> + <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "download?viewtype=stream&filename="..file.value.filename.value, label="Download" } %></TD> <TD style="padding-right:20px;white-space:nowrap;text-align:right"><%= html.html_escape(file.value.filesize.value) %></TD> <TD style="padding-right:20px;white-space:nowrap;"><%= html.html_escape(file.value.mtime.value) %></TD> <TD style="white-space:nowrap;"><%= html.html_escape(file.value.filename.value) %></TD> diff --git a/logfiles-tail-html.lsp b/logfiles-tail-html.lsp index c480b0b..c88b7a2 100644 --- a/logfiles-tail-html.lsp +++ b/logfiles-tail-html.lsp @@ -10,7 +10,7 @@ $.ajaxSetup({cache:false}); $.getJSON( '<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action) %>', - {name:'<% io.write(html.html_escape(form.value.filename.value)) if form.value.grep.value ~= "" then io.write("',grep:'"..html.html_escape(form.value.grep.value)) end %>', offset:currentoffset, viewtype:'json'}, + {filename:'<% io.write(html.html_escape(form.value.filename.value)) if form.value.grep.value ~= "" then io.write("',grep:'"..html.html_escape(form.value.grep.value)) end %>', offset:currentoffset, viewtype:'json'}, function(data) { if (currentoffset != data.value.filesize.value){ |