@@ -1,4 +1,4 @@ -local debug = debug +local debug, tostring = debug, tostring local string = require "luv.string" local type, require, pairs, table, select, io, ipairs = type, require, pairs, table, select, io, ipairs local fields, Exception = require "luv.fields", require "luv.exceptions".Exception fields/references.lua @@ -42,7 +42,7 @@ local Form = Struct:extend{ end self.Meta = self.Meta or {} if not self:widget() then - self:widget(require"luv.forms.widgets".VerticalTableForm()) + self:widget(require"luv.forms.widgets".VerticalTable()) end self:fields(table.map(self:fields(), "clone")) if values then @@ -269,7 +269,7 @@ models.Model.ajaxFieldHandler = function (self, data, preCond, postFunc) return true end io.write(json.serialize{status="ok"}) - postFunc(f, obj) + if postFunc then postFunc(f, obj) end return true end forms/init.lua @@ -105,8 +105,8 @@ local Form = Widget:extend{ end; } -local FlowForm = Form:extend{ - __tag = .....".FlowForm"; +local Flow = Form:extend{ + __tag = .....".Flow"; _beforeFields = ""; _beforeLabel = " "; _afterLabel = " "; @@ -116,8 +116,8 @@ local FlowForm = Form:extend{ init = function () end; } -local HorisontalTableForm = Form:extend{ - __tag = .....".HorisontalTableForm"; +local HorisontalTable = Form:extend{ + __tag = .....".HorisontalTable"; _beforeFields = "<table><tbody><tr>"; _beforeLabel = "<th>"; _afterLabel = "</th>"; @@ -127,8 +127,8 @@ local HorisontalTableForm = Form:extend{ init = function () end; } -local VerticalTableForm = Form:extend{ - __tag = .....".HorisontalTableForm"; +local VerticalTable = Form:extend{ + __tag = .....".HorisontalTable"; _beforeFields = "<table><tbody>"; _beforeLabel = "<tr><th>"; _afterLabel = "</th>"; @@ -139,6 +139,6 @@ local VerticalTableForm = Form:extend{ } return { - Form=Form;FlowForm=FlowForm;HorisontalTableForm=HorisontalTableForm; - VerticalTableForm=VerticalTableForm; + Widget=Form;Flow=Flow;HorisontalTable=HorisontalTable; + VerticalTable=VerticalTable; } forms/widgets.lua a062300ebb986f4edb3a402255e1a641783bd478 5ae2accd3455ccb8986aa8b99852f9174562e240 Artyom Shein temiy@aisys.ru http://github.com/temiy/luv/commit/a493d6b7c1ef97d82b038326dd5813c591fcfd9e a493d6b7c1ef97d82b038326dd5813c591fcfd9e 2009-11-03T08:50:14-08:00 2009-11-03T08:50:14-08:00 Merge /media/disk/luv 964741a7b1ab00cb1a068a2fe35c97fc7b76b0b0 Artyom Shein temiy@aisys.ru