liquid_feedback_frontend
diff app/main/area/show_tab.lua @ 414:699b9fa7bc36
Integrated new event system, splitted issues in open/closed, changed navigation
| author | bsw |
|---|---|
| date | Sat Mar 10 16:57:49 2012 +0100 (2012-03-10) |
| parents | 7196685f9dd7 |
| children | 63d6549cc00b |
line diff
1.1 --- a/app/main/area/show_tab.lua Sat Mar 10 13:54:14 2012 +0100 1.2 +++ b/app/main/area/show_tab.lua Sat Mar 10 16:57:49 2012 +0100 1.3 @@ -1,6 +1,13 @@ 1.4 local area = param.get("area", "table") or Area:by_id(param.get_id()) 1.5 1.6 -local issues_selector = area:get_reference_selector("issues") 1.7 +local open_issues_selector = area:get_reference_selector("issues") 1.8 + :add_where("issue.closed ISNULL") 1.9 + :add_order_by("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.admission_time) - now()") 1.10 + 1.11 +local closed_issues_selector = area:get_reference_selector("issues") 1.12 + :add_where("issue.closed NOTNULL") 1.13 + :add_order_by("issue.closed DESC") 1.14 + 1.15 local members_selector = area:get_reference_selector("members") 1.16 local delegations_selector = area:get_reference_selector("delegations") 1.17 1.18 @@ -10,20 +17,34 @@ 1.19 static_params = { area_id = area.id }, 1.20 } 1.21 1.22 -tabs[#tabs+1] = 1.23 - { 1.24 - name = "issues", 1.25 - label = _"Issues" .. " (" .. tostring(issues_selector:count()) .. ")", 1.26 - icon = { static = "icons/16/folder.png" }, 1.27 - module = "issue", 1.28 - view = "_list", 1.29 - params = { 1.30 - issues_selector = issues_selector, 1.31 - filter = cgi.params["filter"], 1.32 - filter_voting = param.get("filter_voting"), 1.33 - for_area_list = true 1.34 - } 1.35 +tabs[#tabs+1] = { 1.36 + name = "timeline", 1.37 + label = _"Events", 1.38 + module = "event", 1.39 + view = "_list", 1.40 + params = { for_area = area } 1.41 +} 1.42 + 1.43 +tabs[#tabs+1] = { 1.44 + name = "open", 1.45 + label = _"Open issues", 1.46 + module = "issue", 1.47 + view = "_list", 1.48 + params = { 1.49 + for_state = "open", 1.50 + issues_selector = open_issues_selector, for_area = true 1.51 } 1.52 +} 1.53 +tabs[#tabs+1] = { 1.54 + name = "closed", 1.55 + label = _"Closed issues", 1.56 + module = "issue", 1.57 + view = "_list", 1.58 + params = { 1.59 + for_state = "closed", 1.60 + issues_selector = closed_issues_selector, for_area = true 1.61 + } 1.62 +} 1.63 1.64 if app.session.member_id then 1.65 tabs[#tabs+1] =