liquid_feedback_frontend
changeset 24:81586ea68d57
Minor bugfixes
app/main/initiative/_list.lua:
Replaced single by optional object mode
locale/translations.de.lua:
Consistent translation
app/main/initiative/_show.lua:
Added missing case "not approved" in voting info box
app/main/initiative/_show_voting.lua:
Added link to initiative
app/main/initiative/_show_voting.lua:
Added missing argument for link
app/main/member/show_tab.lua:
Added outgoing argument to show outgoing delegations correctly
app/main/initiative/_list.lua:
Replaced single by optional object mode
locale/translations.de.lua:
Consistent translation
app/main/initiative/_show.lua:
Added missing case "not approved" in voting info box
app/main/initiative/_show_voting.lua:
Added link to initiative
app/main/initiative/_show_voting.lua:
Added missing argument for link
app/main/member/show_tab.lua:
Added outgoing argument to show outgoing delegations correctly
author | bsw |
---|---|
date | Sun Feb 21 14:09:11 2010 +0100 (2010-02-21) |
parents | e04122245a44 |
children | 4b2af207cefa |
files | app/main/initiative/_list.lua app/main/initiative/_show.lua app/main/initiative/_show_voting.lua app/main/member/show_tab.lua locale/translations.de.lua |
line diff
1.1 --- a/app/main/initiative/_list.lua Sun Feb 21 13:09:00 2010 +0100 1.2 +++ b/app/main/initiative/_list.lua Sun Feb 21 14:09:11 2010 +0100 1.3 @@ -30,7 +30,7 @@ 1.4 winning_initiative = Initiative:new_selector() 1.5 :add_where{ "issue_id = ?", issue.id } 1.6 :add_where("rank = 1") 1.7 - :single_object_mode() 1.8 + :optional_object_mode() 1.9 :exec() 1.10 if winning_initiative then 1.11 show_for_initiative = winning_initiative
2.1 --- a/app/main/initiative/_show.lua Sun Feb 21 13:09:00 2010 +0100 2.2 +++ b/app/main/initiative/_show.lua Sun Feb 21 14:09:11 2010 +0100 2.3 @@ -23,6 +23,8 @@ 2.4 slot.put(_"Approved") 2.5 elseif initiative.rank then 2.6 slot.put(_("Not approved (rank #{rank})", { rank = initiative.rank })) 2.7 + else 2.8 + slot.put(_"Not approved") 2.9 end 2.10 slot.put("</b>") 2.11 end
3.1 --- a/app/main/initiative/_show_voting.lua Sun Feb 21 13:09:00 2010 +0100 3.2 +++ b/app/main/initiative/_show_voting.lua Sun Feb 21 14:09:11 2010 +0100 3.3 @@ -86,7 +86,14 @@ 3.4 end 3.5 }, 3.6 { 3.7 - name = "name" 3.8 + content = function(record) 3.9 + ui.link{ 3.10 + module = "initiative", 3.11 + view = "show", 3.12 + id = record.id, 3.13 + text = record.name 3.14 + } 3.15 + end 3.16 } 3.17 } 3.18 }
4.1 --- a/app/main/member/show_tab.lua Sun Feb 21 13:09:00 2010 +0100 4.2 +++ b/app/main/member/show_tab.lua Sun Feb 21 14:09:11 2010 +0100 4.3 @@ -76,7 +76,7 @@ 4.4 icon = { static = "icons/16/table_go.png" }, 4.5 module = "delegation", 4.6 view = "_list", 4.7 - params = { delegations_selector = outgoing_delegations_selector }, 4.8 + params = { delegations_selector = outgoing_delegations_selector, outgoing = true }, 4.9 }, 4.10 { 4.11 name = "contacts",
5.1 --- a/locale/translations.de.lua Sun Feb 21 13:09:00 2010 +0100 5.2 +++ b/locale/translations.de.lua Sun Feb 21 14:09:11 2010 +0100 5.3 @@ -78,7 +78,7 @@ 5.4 ["Change name"] = "Name ändern"; 5.5 ["Change order"] = "Sortierung ändern"; 5.6 ["Change password"] = "Kennwort ändern"; 5.7 -["Change vote"] = "Wahl ändern"; 5.8 +["Change vote"] = "Abstimmung ändern"; 5.9 ["Change your login"] = "Deinen Anmeldenamen ändern"; 5.10 ["Change your name"] = "Deinen Namen ändern"; 5.11 ["Change your password"] = "Dein Kennwort ändern";