diff options
| -rw-r--r-- | did-assigndefinition-html.lsp | 19 | ||||
| -rw-r--r-- | did-controller.lua | 2 | ||||
| -rw-r--r-- | did-model.lua | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/did-assigndefinition-html.lsp b/did-assigndefinition-html.lsp index 22ed9da..f054ae1 100644 --- a/did-assigndefinition-html.lsp +++ b/did-assigndefinition-html.lsp @@ -7,7 +7,7 @@ <script type="text/javascript"> var lastdata = {}; $(function(){ -// var data = "<% local result = viewlibrary.dispatch_component("listdefinitions", nil, true) + var data = "<% local result = viewlibrary.dispatch_component("listdefinitions", nil, true) local tab = {} for i,res in ipairs(result.value.definitions.value) do tab[#tab+1] = res.did @@ -15,8 +15,8 @@ io.write(table.concat(tab, " ")) %>".split(" "); $("#did").focus(); $("#did").attr('autocomplete', 'off'); -// $("#did").autocomplete(data); - $("#did").autocomplete("cgi-bin/acf/did/did/searchdefinitionlist"); + $("#did").autocomplete(data); +// $("#did").autocomplete("cgi-bin/acf/did/did/searchdefinitionlist"); $("#did").progress(function(event,data) { // The data is the number of results if (lastdata != data) { @@ -37,13 +37,24 @@ <H1>Assign Definition</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.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 + if val.errtxt then + io.write(string.gsub(html.html_escape(val.errtxt), "\n", "<BR>").."<BR>\n") + end + end + io.write("</P>\n") +end %> + <p class="error" id="errortxt"><p></DD> <form action="/cgi-bin/acf/did/did/assigndefinition" method="POST"> <DT>DID</DT> <DD><input class="text" type="text" id="did" name="did" value=""> <p class="error" id="diderrtxt"><p></DD> <DT>Extension</DT> -<DD><input class="text" type="text" id="extension" name="extension" value=""></DD> +<DD><input class="text" type="text" id="extension" name="rules" value=""></DD> <DT></DT><DD><input class="submit" type="submit" name="Save" value="Save"></DD> </FORM> </DL> diff --git a/did-controller.lua b/did-controller.lua index a18d4b0..1d4aed8 100644 --- a/did-controller.lua +++ b/did-controller.lua @@ -38,7 +38,7 @@ function createdefinition(self) end function assigndefinition(self) - return controllerfunctions.handle_form(self, self.model.getdefinition, self.model.updatedefinition, self.clientdata, "Save", "Assign Definition", "Definition Saved") + return controllerfunctions.handle_form(self, function() return self.model.getdefinition(self.clientdata.did) end, self.model.updatedefinition, self.clientdata, "Save", "Assign Definition", "Definition Saved") end function newdefinition(self) diff --git a/did-model.lua b/did-model.lua index e7d1113..f75b911 100644 --- a/did-model.lua +++ b/did-model.lua @@ -486,7 +486,7 @@ local function parserules(did, rules) for line in string.gmatch(rules, "([^\n]+)") do local tabs = format.string_to_table(line, "%s*,%s*") if #tabs > 0 then - value[#value+1] = {did=did, extension=tabs[1], starttime=tabs[2], endtime=tabs[3], startdate=tabs[4], enddate=tabs[5], dayofweek=tabs[6]} + value[#value+1] = {did=did, extension=tabs[1], starttime=tabs[2] or "", endtime=tabs[3] or "", startdate=tabs[4] or "", enddate=tabs[5] or "", dayofweek=tabs[6] or "0000000"} end end return value |