liquid_feedback_frontend
diff app/main/lf2/issue.lua @ 217:73dbc9e2bfd4
Cummulative patch for enhancements at next generation frontend
author | bsw |
---|---|
date | Sat Mar 12 19:22:50 2011 +0100 (2011-03-12) |
parents | 4f6e6b213fb8 |
children |
line diff
1.1 --- a/app/main/lf2/issue.lua Mon Mar 07 12:15:22 2011 +0100 1.2 +++ b/app/main/lf2/issue.lua Sat Mar 12 19:22:50 2011 +0100 1.3 @@ -12,7 +12,6 @@ 1.4 1.5 local initiatives = issue.initiatives 1.6 1.7 -local interested_members = issue.interested_members 1.8 1.9 local interest = issue.interest 1.10 1.11 @@ -20,7 +19,7 @@ 1.12 1.13 local trustees = Member:new_selector() 1.14 :add_field("delegation_chain.*") 1.15 - :join("delegation_chain(" .. tostring(app.session.member.id) .. ", " .. tostring(area_id or "NULL") .. ", " .. tostring(issue_id or "NULL") .. ")", "delegation_chain", "member.id = delegation_chain.member_id") 1.16 + :join({ "delegation_chain(?, null, ?, ?)", app.session.member_id, not issue.id and area.id or nil, issue.id}, "delegation_chain", "member.id = delegation_chain.member_id") 1.17 :add_order_by("index") 1.18 :exec() 1.19 1.20 @@ -43,17 +42,13 @@ 1.21 app.topnav_area_id = issue.area_id 1.22 1.23 slot.select("sidebar", function() 1.24 - execute.view{ module = "lf2", view = "_sidebar_unit", params = { current_area_id = issue.area_id } } 1.25 + execute.view{ module = "lf2", view = "_sidebar_unit", params = { 1.26 + unit = issue.area.unit, 1.27 + current_area_id = issue.area_id 1.28 + } } 1.29 end) 1.30 1.31 execute.view{ module = "lf2", view = "_area", params = { area = area } } 1.32 - 1.33 -execute.view{ module = "lf2", view = "_issues", params = { issues = { issue } } } 1.34 +execute.view{ module = "lf2", view = "_issue", params = { issue = issue } } 1.35 1.36 --- TODO bugfix for not working reference loader 1.37 -interested_members = issue:get_reference_selector("interested_members_snapshot"):exec() 1.38 1.39 -execute.view{ module = "lf2", view = "_interested", params = { 1.40 - interested_members = interested_members, issue_id = issue.id 1.41 -} } 1.42 -