1.1 --- a/model/issue.lua	Mon Aug 20 03:52:50 2012 +0200
     1.2 +++ b/model/issue.lua	Mon Aug 20 03:53:27 2012 +0200
     1.3 @@ -183,9 +183,9 @@
     1.4  
     1.5  function Issue:get_state_name_for_state(value)
     1.6    local state_name_table = {
     1.7 -    new          = _"New",
     1.8 -    accepted     = _"Discussion",
     1.9 -    frozen       = _"Frozen",
    1.10 +    admission    = _"New",
    1.11 +    discussion   = _"Discussion",
    1.12 +    verification = _"Frozen",
    1.13      voting       = _"Voting",
    1.14      finished     = _"Finished",
    1.15      cancelled    = _"Cancelled"
    1.16 @@ -239,44 +239,11 @@
    1.17    end
    1.18  end
    1.19  
    1.20 -function Issue.object_get:state()
    1.21 -  if self.closed then
    1.22 -    if self.fully_frozen then
    1.23 -      return "finished"
    1.24 -    else
    1.25 -      return "cancelled"
    1.26 -    end
    1.27 -  elseif self.fully_frozen then
    1.28 -    return "voting"
    1.29 -  elseif self.half_frozen then
    1.30 -    return "frozen"
    1.31 -  elseif self.accepted then
    1.32 -    return "accepted"
    1.33 -  else
    1.34 -    return "new"
    1.35 -  end
    1.36 -
    1.37 -end
    1.38  
    1.39  function Issue.object_get:state_name()
    1.40    return Issue:get_state_name_for_state(self.state)
    1.41  end
    1.42  
    1.43 -function Issue.object_get:next_states()
    1.44 -  local state = self.state
    1.45 -  local next_states
    1.46 -  if state == "new" then
    1.47 -    next_states = { "accepted", "cancelled" }
    1.48 -  elseif state == "accepted" then
    1.49 -    next_states = { "frozen" }
    1.50 -  elseif state == "frozen" then
    1.51 -    next_states = { "voting" }
    1.52 -  elseif state == "voting" then
    1.53 -    next_states = { "finished" }
    1.54 -  end
    1.55 -  return next_states
    1.56 -end
    1.57 -
    1.58  function Issue.object_get:next_states_names()
    1.59    local next_states = self.next_states
    1.60    if not next_states then