1.1 --- a/model/issue.lua	Thu Mar 03 23:47:35 2011 +0100
     1.2 +++ b/model/issue.lua	Sat Mar 05 15:34:17 2011 +0100
     1.3 @@ -302,15 +302,15 @@
     1.4    if args.area_id then
     1.5      selector:add_where{ "issue.area_id = ?", args.area_id }
     1.6    end
     1.7 -  if args.state == "closed" then
     1.8 +  if args.phase == "closed" then
     1.9      selector:add_where("issue.closed NOTNULL")
    1.10 -  elseif args.state == "voting" then
    1.11 +  elseif args.phase == "voting" then
    1.12      selector:add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL")
    1.13 -  elseif args.state == "frozen" then
    1.14 +  elseif args.phase == "frozen" then
    1.15      selector:add_where("issue.half_frozen NOTNULL AND issue.fully_frozen ISNULL AND issue.closed ISNULL")
    1.16 -  elseif args.state == "discussion" then
    1.17 +  elseif args.phase == "discussion" then
    1.18      selector:add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL")
    1.19 -  elseif args.state == "new" then
    1.20 +  elseif args.phase == "new" then
    1.21      selector:add_where("issue.accepted ISNULL AND issue.closed ISNULL")
    1.22    end
    1.23    if args.order == "time_left" then
    1.24 @@ -343,6 +343,15 @@
    1.25  
    1.26  end
    1.27  
    1.28 +function Issue.object_get:phase()
    1.29 +  local state = self.state
    1.30 +  if state == "finished" or state == "cancelled" then
    1.31 +    return "closed"
    1.32 +  else
    1.33 +    return state
    1.34 +  end
    1.35 +end
    1.36 +
    1.37  function Issue.object_get:state_name()
    1.38    return Issue:get_state_name_for_state(self.state)
    1.39  end