Added editdefinitionextension action and added available to edit fields.

1 files changed, 5 insertions, 6 deletions

diff --git a/did-model.lua b/did-model.lua
index d28d775..0a31665 100644
--- a/did-model.lua
+++ b/did-model.lua
@@ -234,9 +234,7 @@ local getdefinitionentries = function(sql)
 	row = cur:fetch ({}, "a")
 	while row do
 		entries[#entries+1] = {did=row.did, identification=row.identification, department=row.department, description=row.description, extension=row.extension, available=row.available, lastchange=row.lastchange}
-		if entries[#entries].available then
-			entries[#entries].available = (entries[#entries].available == 't')
-		end
+		entries[#entries].available = (entries[#entries].available == 't')
 		row = cur:fetch (row, "a")
 	end
 	-- close everything
@@ -353,7 +351,7 @@ end
 local updatedefinitionentry = function(definition)
 	local sql = string.format("UPDATE definition SET identification='%s', department='%s', description='%s', available=%s, lastchange='now' WHERE did='%s'",
 		escape(definition.identification), escape(definition.department), escape(definition.description),
-		tostring(definition.available), escape(definition.did))
+		tostring(definition.available or false), escape(definition.did))
 	local res = assert (con:execute(sql))
 --	logme("Updated DID "..definition.did)
 	return res
@@ -717,8 +715,8 @@ local describechange = function(olddef, newdef)
 	local changes = {}
 	olddef = olddef or {}
 	for name,val in pairs(newdef) do
-		if name ~= "did" and name ~= "rules" and val ~= (olddef[name] or "") then
-			changes[#changes+1] = name.." from '"..(olddef[name] or "").."' to '"..val.."'"
+		if name ~= "did" and name ~= "rules" and tostring(val) ~= (tostring(olddef[name]) or "") then
+			changes[#changes+1] = name.." from '"..(tostring(olddef[name]) or "").."' to '"..tostring(val).."'"
 		end
 	end
 
@@ -905,6 +903,7 @@ function getdefinition(self, userid, did)
 	group.lastchange = cfe({ label="Last Change" })
 	group.description = cfe({ label="Description" })
 	group.rules = cfe({ type="longtext", label="Rules", descr="One entry (extension, starttime, endtime, startdate, enddate, dayofweek) per line"})
+	group.available = cfe({ type="boolean", label="Available", descr="Available for request"})
 	if did then
 		group.did.errtxt = "DID does not exist"
 		local res, err = pcall(function()