From c6b5228ab2bdf1578a32ffb9cb06b2962cfcb5c6 Mon Sep 17 00:00:00 2001
From: Mika Havela <mika.havela@gmail.com>
Date: Thu, 9 Jul 2009 07:23:16 +0000
Subject: Hide path to .graph files

---
 rrdtool-listgraphcfg-html.lsp | 2 +-
 rrdtool-model.lua             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rrdtool-listgraphcfg-html.lsp b/rrdtool-listgraphcfg-html.lsp
index 33d8405..7ca6df5 100644
--- a/rrdtool-listgraphcfg-html.lsp
+++ b/rrdtool-listgraphcfg-html.lsp
@@ -39,7 +39,7 @@ function javascript_confirm_graph(formID,filename) {
 				<A STYLE="cursor: pointer;" onclick="javascript_confirm_graph('confirmDisplay','<% io.write(file.value.filename.value) %>')">Delete</A>
 			<% end %>
 			<%
-			if session.permissions[page_info.controller].edit then io.write(html.link{value = "editgraphcfg?filename=" .. file.value.filename.value.."&redir="..page_info.orig_action, label="Edit " }) end
+			if session.permissions[page_info.controller].edit then io.write(html.link{value = "editgraphcfg?filename=" .. string.gsub(file.value.filename.value, "^.*/", "").."&redir="..page_info.orig_action, label="Edit " }) end
 			%>
 		</TD>
 		<TD style="padding-right:20px;white-space:nowrap;text-align:right;"><%= html.html_escape(file.value.filesize.value) %></TD>
diff --git a/rrdtool-model.lua b/rrdtool-model.lua
index b3f6dee..16ba2be 100644
--- a/rrdtool-model.lua
+++ b/rrdtool-model.lua
@@ -228,12 +228,16 @@ function getgraphlist()
 end
 
 function getgraphfile(path)
+	if (path) then
+		path = graphpath .. "/" .. path
+	end
 	if (path) and not (validfilename(path)) then
 		path = nil
 	end
 	local filedetails = modelfunctions.getfiledetails(path)
 	local output = {value={filename=filedetails.value.filename,
 	  filecontent=filedetails.value.filecontent,}}
+	output.value.filename.value = string.gsub(filedetails.value.filename.value, "^.*/", "")
 --	output.value.filecontent.rows="30"	-- FIXME: For some reason I can't control the size of a textarea
 	if not (path) then
 		output.value.filename.errtxt=nil
-- 
cgit v1.2.3