diff options
| -rw-r--r-- | did-assigndefinition-html.lsp | 2 | ||||
| -rw-r--r-- | did-controller.lua | 4 | ||||
| -rw-r--r-- | did-html.lsp | 2 | ||||
| -rw-r--r-- | did-model.lua | 17 |
4 files changed, 18 insertions, 7 deletions
diff --git a/did-assigndefinition-html.lsp b/did-assigndefinition-html.lsp index 567ec03..bfe72f0 100644 --- a/did-assigndefinition-html.lsp +++ b/did-assigndefinition-html.lsp @@ -69,7 +69,7 @@ <H1>Assign DID Number</H1> <DL> -<% if form.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(form.descr), "\n", "<BR>") .. " " .. form.value.did.value .. "</P>\n") end %> +<% if form.descr then io.write('<P CLASS="descr">' .. string.gsub(html.html_escape(form.descr), "\n", "<BR>") .. "</P>\n") end %> <% if form.errtxt then io.write('<P CLASS="error">' .. string.gsub(html.html_escape(form.errtxt), "\n", "<BR>") .. " " .. html.html_escape(form.value.did.value) .. "<BR>\n") for name,val in pairs(form.value) do diff --git a/did-controller.lua b/did-controller.lua index 1dceb94..0f30761 100644 --- a/did-controller.lua +++ b/did-controller.lua @@ -30,7 +30,7 @@ function searchdefinitionlist(self) end function editdefinition(self) - return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self.clientdata.did) end, self.model.updatedefinition, self.clientdata, "Save", "Edit DID Number", "DID Number Saved") + return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self.clientdata.did) end, self.model.updatedefinition, self.clientdata, "Save", "Edit DID Number") end function createdefinition(self) @@ -39,7 +39,7 @@ end function assigndefinition(self) self.conf.viewtype = self.clientdata.viewtype or self.conf.viewtype - return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self.clientdata.did) end, self.model.updatedefinition, self.clientdata, "Save", "Assign DID Number", "DID Number Saved") + return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self.clientdata.did) end, self.model.updatedefinition, self.clientdata, "Save", "Assign DID Number") end function newdefinition(self) diff --git a/did-html.lsp b/did-html.lsp index b86fc14..efd7125 100644 --- a/did-html.lsp +++ b/did-html.lsp @@ -41,7 +41,7 @@ function newPopup(url) { <% for i,def in ipairs(subdata) do %> <TR> <TD> - <%= html.link{value = "editdefinition?did=" .. def.did, label="Edit "} %> + <%= html.link{value = "editdefinition?did="..def.did.."&redir="..page_info.orig_action, label="Edit "} %> <% if viewlibrary.check_permission("publish") then %> <%= html.link{value = "publish?did=" .. def.did, label="Publish "} %> <% end %> diff --git a/did-model.lua b/did-model.lua index 866103c..a84144c 100644 --- a/did-model.lua +++ b/did-model.lua @@ -269,7 +269,7 @@ local updatedefinitionentry = function(definition) escape(definition.identification), escape(definition.department), escape(definition.description), escape(definition.did)) local res = assert (con:execute(sql)) - logme("Updated DID "..definition.did) +-- logme("Updated DID "..definition.did) return res end @@ -341,7 +341,18 @@ local updaterules = function(did, rules) sql = table.concat(sql, "") res = assert (con:execute(sql)) end - logme("Updated "..#rules.." rules for DID "..did) + if #rules > 1 then + res = {} + for i,rule in ipairs(rules) do + res[#res+1] = rule.extension + end + res = "Set DID "..did.." to extensions "..table.concat(res, ", ") + elseif #rules == 1 then + res = "Set DID "..did.." to extension "..rules[1].extension + else + res = "Cleared DID "..did + end + logme(res) return res end @@ -735,7 +746,7 @@ function savedefinition(defin, exists) else insertdefinitionentry(definition) end - updaterules(defin.value.did.value, rules) + defin.descr = updaterules(defin.value.did.value, rules) defin.errtxt = nil end if connected then databasedisconnect() end |