1.1 --- a/model/issue.lua	Sat Mar 12 19:22:50 2011 +0100
     1.2 +++ b/model/issue.lua	Sun Mar 13 16:53:33 2011 +0100
     1.3 @@ -276,12 +276,13 @@
     1.4  
     1.5  function Issue:get_state_name_for_state(value)
     1.6    local state_name_table = {
     1.7 -    new          = _"New",
     1.8 +    admission    = _"New",
     1.9      accepted     = _"Discussion",
    1.10      frozen       = _"Frozen",
    1.11      voting       = _"Voting",
    1.12      finished     = _"Finished",
    1.13 -    cancelled    = _"Cancelled"
    1.14 +    cancelled    = _"Cancelled",
    1.15 +    canceled_issue_not_accepted = _"Cancelled"
    1.16    }
    1.17    return state_name_table[value] or value or ''
    1.18  end
    1.19 @@ -364,6 +365,7 @@
    1.20    return selector
    1.21  end
    1.22  
    1.23 +--[[
    1.24  function Issue.object_get:state()
    1.25    if self.closed then
    1.26      if self.fully_frozen then
    1.27 @@ -382,6 +384,7 @@
    1.28    end
    1.29  
    1.30  end
    1.31 +--]]
    1.32  
    1.33  function Issue.object_get:phase()
    1.34    local state = self.state
    1.35 @@ -400,7 +403,7 @@
    1.36    local state = self.state
    1.37    local last_event_time
    1.38    local duration
    1.39 -  if state == "new" then
    1.40 +  if state == "admission" then
    1.41      last_event_time = self.created
    1.42      duration = self.admission_time
    1.43    elseif state == "accepted" then