fixed db.loots call, this closes #4863

git-svn-id: file:///home/svn/framework3/trunk@13284 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Raphael Mudge 2011-07-21 19:15:34 +00:00
parent 21922cdcd7
commit 6c4ee16d58
1 changed files with 7 additions and 6 deletions

View File

@ -962,14 +962,15 @@ public
@framework.db.loots(wspace).each do |l| @framework.db.loots(wspace).each do |l|
loot = {} loot = {}
loot[:host] = l.host.address || l.host.address6 if(l.host) loot[:host] = l.host.address || l.host.address6 if(l.host)
loot[:service] = l.service.name || n.service.port if(n.service) loot[:service] = l.service.name || l.service.port if(l.service)
loot[:ltype] = l.ltype loot[:ltype] = l.ltype
loot[:ctype] = l.ctype loot[:content_type] = l.content_type
loot[:data] = l.data loot[:data] = l.data if (l.data)
loot[:created_at] = l.created_at.to_i loot[:created_at] = l.created_at.to_i
loot[:updated_at] = l.updated_at.to_i loot[:updated_at] = l.updated_at.to_i
loot[:name] = l.name loot[:name] = l.name if (l.name)
loot[:info] = l.info loot[:info] = l.info if (l.info)
loot[:path] = l.path
ret[:loots] << loot ret[:loots] << loot
end end
ret ret