liquid_feedback_frontend

diff app/main/issue/_list.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 3f2ae4f7a045
children 7ebf90c7d436
line diff
     1.1 --- a/app/main/issue/_list.lua	Sat Mar 10 13:54:14 2012 +0100
     1.2 +++ b/app/main/issue/_list.lua	Sat Mar 10 16:57:49 2012 +0100
     1.3 @@ -1,5 +1,15 @@
     1.4  local issues_selector = param.get("issues_selector", "table")
     1.5  local for_member = param.get("for_member", "table") or app.session.member
     1.6 +local for_state = param.get("for_state")
     1.7 +local for_unit = param.get("for_unit", atom.boolean)
     1.8 +local for_area = param.get("for_area", atom.boolean)
     1.9 +
    1.10 +
    1.11 +if for_state == "open" then
    1.12 +  issues_selector:add_where("issue.closed ISNULL")
    1.13 +elseif for_state == "closed" then
    1.14 +  issues_selector:add_where("issue.closed NOTNULL")
    1.15 +end
    1.16  
    1.17  if app.session.member_id then
    1.18    issues_selector
    1.19 @@ -20,7 +30,9 @@
    1.20    "issue_list" 
    1.21  }
    1.22  
    1.23 -local filters = execute.load_chunk{module="issue", chunk="_filters.lua", params = { member = for_member }}
    1.24 +local filters = execute.load_chunk{module="issue", chunk="_filters.lua", params = {
    1.25 +  member = for_member, state = for_state, for_unit = for_unit, for_area = for_area
    1.26 +}}
    1.27  
    1.28  filters.content = function()
    1.29    ui.paginate{
    1.30 @@ -120,6 +132,9 @@
    1.31                    ui.tag{ content = issue.area.name }
    1.32                    slot.put(" · ")
    1.33                    ui.tag{ content = issue.area.unit.name }
    1.34 +                  slot.put(" · ")
    1.35 +                  ui.tag{ content = issue.policy.name }
    1.36 +
    1.37  
    1.38                end
    1.39                }
    1.40 @@ -128,14 +143,15 @@
    1.41                  tag = "div",
    1.42                  content = function()
    1.43                  
    1.44 -                  ui.tag{ content = issue.policy.name }
    1.45 -
    1.46 -                  slot.put(" · ")
    1.47 -                  ui.tag{ content = issue.state_name }
    1.48 +                  ui.tag{ attr = { class = "event_name" }, content = issue.state_name }
    1.49  
    1.50                    if issue.state_time_left then
    1.51                      slot.put(" · ")
    1.52 -                    ui.tag{ content = _("#{time_left} left", { time_left = issue.state_time_left:gsub("days", _"days"):gsub("day", _"day") }) }
    1.53 +                    if issue.state_time_left:sub(1,1) == "-" then
    1.54 +                      ui.tag{ content = _("Counting starts soon") }
    1.55 +                    else
    1.56 +                      ui.tag{ content = _("#{time_left} left", { time_left = issue.state_time_left:gsub("days", _"days"):gsub("day", _"day") }) }
    1.57 +                    end
    1.58                    end
    1.59  
    1.60                  end

Impressum / About Us