@@ -263,7 +263,7 @@ local NestedSetSelect = Select:extend{
minLevel = (minLevel and (minLevel < level and minLevel or level)) or level
data[v.pk] = {value=v.pk;label=tostring(v);hasChildren=v:hasChildren();left=v.left;right=v.right;level=v.level}
end
- local id = fieldId(form, field)
+ local id = self:_fieldId(field, form)
local value = field:value()
return
"<div id="..("%q"):format(id.."Back").."></div>"
fields/widgets.lua
@@ -61,16 +61,16 @@ local UrlConf = Object:extend{
end
for _, item in pairs(urls) do
if "string" == type(item[1]) then
- local res = {self._tailUri:find(item[1])}
+ local res = {self:tailUri():find(item[1])}
if nil ~= res[1] then
- local oldTailUri, oldBaseUri, oldCaptures = self:tailUri(), self:baseUri(), self:captures()
local tailUriLen = string.utf8len(self:tailUri())
self:baseUri(self:baseUri()..self:uri():slice(1, -tailUriLen+res[1]-2))
self:tailUri(self:tailUri():sub(res[2]+1))
- self:captures{}
+ local captures = {}
for i = 3, #res do
- table.insert(self._captures, res[i])
+ table.insert(captures, res[i])
end
+ self:captures(captures)
if false ~= self:execute(item[2]) then
return true
end
@@ -126,7 +126,7 @@ local Core = Object:extend{
return self
end);
dsn = property("string", nil, function (self, dsn)
- local drivers = {mysql="sql";redis="keyvalue";redmap="keyvalue"}
+ local drivers = {mysql="sql";redis="keyvalue"}
self._dsn = dsn
local db = require("luv.db."..drivers[dsn:slice(1, dsn:find":"-1):lower()]).Factory(dsn)
require"luv.db.models".Model:db(db)
init.lua
cc0dec2faa68b6b1ac802b71e49a8a386f1b8a28
Artyom Shein
temiy@aisys.ru
http://github.com/temiy/luv/commit/4d7308a5c53fe497a67590d90cef33d68c0886f7
4d7308a5c53fe497a67590d90cef33d68c0886f7
2009-10-23T05:11:55-07:00
2009-10-23T05:11:55-07:00
Fixed fields.widgets.NestedSetSelect. Tiny changes.
29705870711969838e8c2a89338cbca96553d5bf
Artyom Shein
temiy@aisys.ru