# HG changeset patch # User bsw # Date 1331797612 -3600 # Node ID 87c33552f4066daadaeec5771b66f4ec02b41242 # Parent 6e13a7da16b5b14805363c49064cce9e7a3daba1 Fix links from area list to issue phases diff -r 6e13a7da16b5 -r 87c33552f406 app/main/area/_list.lua --- a/app/main/area/_list.lua Wed Mar 14 21:33:51 2012 +0100 +++ b/app/main/area/_list.lua Thu Mar 15 08:46:52 2012 +0100 @@ -140,7 +140,7 @@ module = "area", view = "show", id = area.id, - params = { filter = "new", tab = "issues" } + params = { filter = "new", tab = "open" } } end } @@ -150,7 +150,7 @@ module = "area", view = "show", id = area.id, - params = { filter = "accepted", tab = "issues" } + params = { filter = "accepted", tab = "open" } } end } @@ -160,7 +160,7 @@ module = "area", view = "show", id = area.id, - params = { filter = "half_frozen", tab = "issues" } + params = { filter = "half_frozen", tab = "open" } } end } @@ -170,7 +170,7 @@ module = "area", view = "show", id = area.id, - params = { filter = "frozen", tab = "issues" } + params = { filter = "frozen", tab = "open" } } end } @@ -180,7 +180,7 @@ module = "area", view = "show", id = area.id, - params = { filter = "finished", issue_list = "newest", tab = "issues" } + params = { filter = "finished", tab = "closed" } } end } @@ -190,7 +190,7 @@ module = "area", view = "show", id = area.id, - params = { filter = "cancelled", issue_list = "newest", tab = "issues" } + params = { filter = "cancelled", issue_list = "newest", tab = "closed" } } end } diff -r 6e13a7da16b5 -r 87c33552f406 app/main/index/_not_voted_issues.lua --- a/app/main/index/_not_voted_issues.lua Wed Mar 14 21:33:51 2012 +0100 +++ b/app/main/index/_not_voted_issues.lua Thu Mar 15 08:46:52 2012 +0100 @@ -27,7 +27,9 @@ view = "show", id = record.id, params = { + tab = "open", filter = "frozen", + filter_interest = "any", filter_voting = "not_voted" } } @@ -51,8 +53,9 @@ view = "show", id = record.id, params = { + tab = "open", filter = "frozen", - filter_interest = "my", + filter_interest = "issue", filter_voting = "not_voted" } } diff -r 6e13a7da16b5 -r 87c33552f406 app/main/issue/_filters.lua --- a/app/main/issue/_filters.lua Wed Mar 14 21:33:51 2012 +0100 +++ b/app/main/issue/_filters.lua Thu Mar 15 08:46:52 2012 +0100 @@ -210,15 +210,22 @@ } filter[#filter+1] = { + name = "finished", + label = _"Finished", + selector_modifier = function(selector) + selector:add_where("issue.state = 'finished_with_winner'") + end + } + filter[#filter+1] = { name = "finished_with_winner", - label = _"Finished with winner", + label = _"with winner", selector_modifier = function(selector) selector:add_where("issue.state = 'finished_with_winner'") end } filter[#filter+1] = { name = "finished_without_winner", - label = _"Finished without winner", + label = _"without winner", selector_modifier = function(selector) selector:add_where("issue.state = 'finished_without_winner'") end