Edit existing and create new graph-files

Putting back full path on graph-files to get standard functions to work propperly

1 files changed, 18 insertions, 6 deletions

diff --git a/rrdtool-model.lua b/rrdtool-model.lua
index 16ba2be..e915a4a 100644
--- a/rrdtool-model.lua
+++ b/rrdtool-model.lua
@@ -228,21 +228,33 @@ 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
-	else
-		output.value.filename.disabled="true"
 	end
 	return output
 end
+
+function set_filedetails (self, filedetails, userid)
+	if not (string.match(filedetails.value.filename.value, "^" .. graphpath)) then
+		filedetails.value.filename.value = graphpath .. "/" .. string.gsub(filedetails.value.filename.value,"^.*/", "")
+	end
+	if not (string.match(filedetails.value.filename.value, "\.graph$")) then
+		filedetails.value.filename.value = filedetails.value.filename.value .. ".graph"
+	end
+
+	filedetails = modelfunctions.setfiledetails(filedetails, getgraphlist)
+	filedetails.value.filesize = nil
+	filedetails.value.mtime = nil
+	return filedetails
+end
+
+function setgraphfile(filedetails,file)
+	return modelfunctions.setfiledetails(filedetails, {file})
+end