1.1 --- a/model/issue.lua	Sat Mar 09 19:13:55 2013 +0100
     1.2 +++ b/model/issue.lua	Sat Mar 09 19:19:44 2013 +0100
     1.3 @@ -185,18 +185,28 @@
     1.4    initiatives:load_everything_for_member_id(member_id)
     1.5  end
     1.6  
     1.7 +
     1.8 +
     1.9  function Issue:get_state_name_for_state(value)
    1.10    local state_name_table = {
    1.11 -    admission    = _"New",
    1.12 -    discussion   = _"Discussion",
    1.13 +    admission = _"New",
    1.14 +    discussion = _"Discussion",
    1.15      verification = _"Frozen",
    1.16 -    voting       = _"Voting",
    1.17 -    finished     = _"Finished",
    1.18 -    cancelled    = _"Cancelled"
    1.19 +    voting = _"Voting",
    1.20 +    canceled_revoked_before_accepted = _"Cancelled (before accepted due to revocation)",
    1.21 +    canceled_issue_not_accepted = _"Cancelled (issue not accepted)",
    1.22 +    canceled_after_revocation_during_discussion = _"Cancelled (during discussion due to revocation)",
    1.23 +    canceled_after_revocation_during_verification = _"Cancelled (during verification due to revocation)",
    1.24 +    calculation = _"Calculation",
    1.25 +    canceled_no_initiative_admitted = _"Cancelled (no initiative admitted)",
    1.26 +    finished_without_winner = _"Finished (without winner)",
    1.27 +    finished_with_winner = _"Finished (with winner)"
    1.28    }
    1.29    return state_name_table[value] or value or ''
    1.30  end
    1.31  
    1.32 +
    1.33 +
    1.34  function Issue:get_search_selector(search_string)
    1.35    return self:new_selector()
    1.36      :join('"initiative"', nil, '"initiative"."issue_id" = "issue"."id"')