From 3cb42e2c39d20d4dc7d0c8b294b883c39e837963 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Wed, 22 Feb 2012 13:49:36 +0000 Subject: Changed forms to always use 'submit' as name of submit button, plus allow multiple submit buttons --- lib/controllerfunctions.lua | 6 +++--- lib/htmlviewfunctions.lua | 11 ++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/controllerfunctions.lua b/lib/controllerfunctions.lua index aba22ed..9c9af31 100644 --- a/lib/controllerfunctions.lua +++ b/lib/controllerfunctions.lua @@ -65,12 +65,12 @@ function handle_clientdata(form, clientdata, group) end function handle_form(self, getFunction, setFunction, clientdata, option, label, descr) - local form = getFunction() + local form = getFunction(clientdata) - if clientdata[option] then + if clientdata.submit then handle_clientdata(form, clientdata) - form = setFunction(form) + form = setFunction(form, clientdata.submit) if not form.errtxt and descr then form.descr = descr end diff --git a/lib/htmlviewfunctions.lua b/lib/htmlviewfunctions.lua index ef59485..08db605 100644 --- a/lib/htmlviewfunctions.lua +++ b/lib/htmlviewfunctions.lua @@ -224,7 +224,16 @@ end function displayformend(myform) if not myform then return end - io.write('
\n') + local option = myform.submit or myform.option + io.write('
') + if type(option) == "table" then + for i,v in ipairs(option) do + io.write('\n') + end + else + io.write('\n') + end + io.write('
\n') io.write('') io.write('\n') end -- cgit v1.2.3