liquid_feedback_frontend

changeset 478:87c33552f406

Fix links from area list to issue phases
author bsw
date Thu Mar 15 08:46:52 2012 +0100 (2012-03-15)
parents 6e13a7da16b5
children edcf827d7ac3
files app/main/area/_list.lua app/main/index/_not_voted_issues.lua app/main/issue/_filters.lua
line diff
     1.1 --- a/app/main/area/_list.lua	Wed Mar 14 21:33:51 2012 +0100
     1.2 +++ b/app/main/area/_list.lua	Thu Mar 15 08:46:52 2012 +0100
     1.3 @@ -140,7 +140,7 @@
     1.4              module = "area",
     1.5              view = "show",
     1.6              id = area.id,
     1.7 -            params = { filter = "new", tab = "issues" }
     1.8 +            params = { filter = "new", tab = "open" }
     1.9            }
    1.10          end }
    1.11  
    1.12 @@ -150,7 +150,7 @@
    1.13              module = "area",
    1.14              view = "show",
    1.15              id = area.id,
    1.16 -            params = { filter = "accepted", tab = "issues" }
    1.17 +            params = { filter = "accepted", tab = "open" }
    1.18            }
    1.19          end }
    1.20  
    1.21 @@ -160,7 +160,7 @@
    1.22              module = "area",
    1.23              view = "show",
    1.24              id = area.id,
    1.25 -            params = { filter = "half_frozen", tab = "issues" }
    1.26 +            params = { filter = "half_frozen", tab = "open" }
    1.27            }
    1.28          end }
    1.29  
    1.30 @@ -170,7 +170,7 @@
    1.31              module = "area",
    1.32              view = "show",
    1.33              id = area.id,
    1.34 -            params = { filter = "frozen", tab = "issues" }
    1.35 +            params = { filter = "frozen", tab = "open" }
    1.36            }
    1.37          end }
    1.38  
    1.39 @@ -180,7 +180,7 @@
    1.40              module = "area",
    1.41              view = "show",
    1.42              id = area.id,
    1.43 -            params = { filter = "finished", issue_list = "newest", tab = "issues" }
    1.44 +            params = { filter = "finished", tab = "closed" }
    1.45            }
    1.46          end }
    1.47  
    1.48 @@ -190,7 +190,7 @@
    1.49              module = "area",
    1.50              view = "show",
    1.51              id = area.id,
    1.52 -            params = { filter = "cancelled", issue_list = "newest", tab = "issues" }
    1.53 +            params = { filter = "cancelled", issue_list = "newest", tab = "closed" }
    1.54            }
    1.55          end }
    1.56  
     2.1 --- a/app/main/index/_not_voted_issues.lua	Wed Mar 14 21:33:51 2012 +0100
     2.2 +++ b/app/main/index/_not_voted_issues.lua	Thu Mar 15 08:46:52 2012 +0100
     2.3 @@ -27,7 +27,9 @@
     2.4                view = "show",
     2.5                id = record.id,
     2.6                params = { 
     2.7 +                tab = "open",
     2.8                  filter = "frozen",
     2.9 +                filter_interest = "any",
    2.10                  filter_voting = "not_voted"
    2.11                }
    2.12              }
    2.13 @@ -51,8 +53,9 @@
    2.14                view = "show",
    2.15                id = record.id,
    2.16                params = { 
    2.17 +                tab = "open",
    2.18                  filter = "frozen",
    2.19 -                filter_interest = "my",
    2.20 +                filter_interest = "issue",
    2.21                  filter_voting = "not_voted"
    2.22                }
    2.23              }
     3.1 --- a/app/main/issue/_filters.lua	Wed Mar 14 21:33:51 2012 +0100
     3.2 +++ b/app/main/issue/_filters.lua	Thu Mar 15 08:46:52 2012 +0100
     3.3 @@ -210,15 +210,22 @@
     3.4    }
     3.5  
     3.6    filter[#filter+1] = {
     3.7 +    name = "finished",
     3.8 +    label = _"Finished",
     3.9 +    selector_modifier = function(selector)
    3.10 +      selector:add_where("issue.state = 'finished_with_winner'")
    3.11 +    end
    3.12 +  }
    3.13 +  filter[#filter+1] = {
    3.14      name = "finished_with_winner",
    3.15 -    label = _"Finished with winner",
    3.16 +    label = _"with winner",
    3.17      selector_modifier = function(selector)
    3.18        selector:add_where("issue.state = 'finished_with_winner'")
    3.19      end
    3.20    }
    3.21    filter[#filter+1] = {
    3.22      name = "finished_without_winner",
    3.23 -    label = _"Finished without winner",
    3.24 +    label = _"without winner",
    3.25      selector_modifier = function(selector)
    3.26        selector:add_where("issue.state = 'finished_without_winner'")
    3.27      end

Impressum / About Us