liquid_feedback_frontend
changeset 41:53a45356c107 beta13
Several bugfixes, including bugfix in timeline
- Fixed grouping of multiple new drafts in timeline
- Do not allow to add suggestions when issue is half frozen
- Do not show initiator invitations for (half-)frozen or closed issues
- Fixed problem with duplicates in display of vote-later requests
- Clarified german "member is participating" info text in delegation chain
- Hide inactive members from member listing
- Fixed grouping of multiple new drafts in timeline
- Do not allow to add suggestions when issue is half frozen
- Do not show initiator invitations for (half-)frozen or closed issues
- Fixed problem with duplicates in display of vote-later requests
- Clarified german "member is participating" info text in delegation chain
- Hide inactive members from member listing
author | bsw |
---|---|
date | Sun Mar 07 15:36:54 2010 +0100 (2010-03-07) |
parents | ca3a0552927f |
children | 1ccbefa729eb |
files | app/main/index/index.lua app/main/initiative/_show.lua app/main/initiative/_suggestions.lua app/main/issue/show_tab.lua app/main/member/list.lua app/main/suggestion/_action/add.lua app/main/timeline/index.lua config/default.lua locale/translations.de.lua locale/translations.eo.lua |
line diff
1.1 --- a/app/main/index/index.lua Sun Mar 07 15:20:51 2010 +0100 1.2 +++ b/app/main/index/index.lua Sun Mar 07 15:36:54 2010 +0100 1.3 @@ -197,7 +197,9 @@ 1.4 end 1.5 1.6 local initiatives_selector = Initiative:new_selector() 1.7 + :join("issue", "_issue_state", "_issue_state.id = initiative.issue_id") 1.8 :join("initiator", nil, { "initiator.initiative_id = initiative.id AND initiator.member_id = ? AND initiator.accepted ISNULL", app.session.member.id }) 1.9 + :add_where("_issue_state.closed ISNULL AND _issue_state.half_frozen ISNULL") 1.10 1.11 if initiatives_selector:count() > 0 then 1.12 ui.container{
2.1 --- a/app/main/initiative/_show.lua Sun Mar 07 15:20:51 2010 +0100 2.2 +++ b/app/main/initiative/_show.lua Sun Mar 07 15:36:54 2010 +0100 2.3 @@ -72,7 +72,7 @@ 2.4 } 2.5 end 2.6 2.7 -if initiator and initiator.accepted == nil then 2.8 +if initiator and initiator.accepted == nil and not initiative.issue.half_frozen and not initiative.issue.closed then 2.9 ui.container{ 2.10 attr = { class = "initiator_invite_info" }, 2.11 content = function()
3.1 --- a/app/main/initiative/_suggestions.lua Sun Mar 07 15:20:51 2010 +0100 3.2 +++ b/app/main/initiative/_suggestions.lua Sun Mar 07 15:36:54 2010 +0100 3.3 @@ -1,6 +1,6 @@ 3.4 local initiative = param.get("initiative", "table") 3.5 3.6 -if not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then 3.7 +if not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then 3.8 ui.link{ 3.9 content = function() 3.10 ui.image{ static = "icons/16/comment_add.png" }
4.1 --- a/app/main/issue/show_tab.lua Sun Mar 07 15:20:51 2010 +0100 4.2 +++ b/app/main/issue/show_tab.lua Sun Mar 07 15:36:54 2010 +0100 4.3 @@ -18,6 +18,7 @@ 4.4 local voting_requests_selector = issue:get_reference_selector("interested_members_snapshot") 4.5 :join("issue", nil, "issue.id = direct_interest_snapshot.issue_id") 4.6 :add_where("direct_interest_snapshot.voting_requested = false") 4.7 + :add_where("direct_interest_snapshot.event = issue.latest_snapshot_event") 4.8 4.9 local delegations_selector = issue:get_reference_selector("delegations") 4.10
5.1 --- a/app/main/member/list.lua Sun Mar 07 15:20:51 2010 +0100 5.2 +++ b/app/main/member/list.lua Sun Mar 07 15:36:54 2010 +0100 5.3 @@ -2,8 +2,11 @@ 5.4 5.5 util.help("member.list") 5.6 5.7 +local members_selector = Member:new_selector() 5.8 + :add_where("active") 5.9 + 5.10 execute.view{ 5.11 module = "member", 5.12 view = "_list", 5.13 - params = { members_selector = Member:new_selector() } 5.14 + params = { members_selector = members_selector } 5.15 }
6.1 --- a/app/main/suggestion/_action/add.lua Sun Mar 07 15:20:51 2010 +0100 6.2 +++ b/app/main/suggestion/_action/add.lua Sun Mar 07 15:36:54 2010 +0100 6.3 @@ -25,8 +25,8 @@ 6.4 if issue.closed then 6.5 slot.put_into("error", _"This issue is already closed.") 6.6 return false 6.7 -elseif issue.fully_frozen then 6.8 - slot.put_into("error", _"Voting for this issue has already begun.") 6.9 +elseif issue.half_frozen then 6.10 + slot.put_into("error", _"This issue is already frozen.") 6.11 return false 6.12 end 6.13
7.1 --- a/app/main/timeline/index.lua Sun Mar 07 15:20:51 2010 +0100 7.2 +++ b/app/main/timeline/index.lua Sun Mar 07 15:36:54 2010 +0100 7.3 @@ -300,7 +300,7 @@ 7.4 :add_field("max(timeline.occurrence)", "occurrence") 7.5 :add_field("timeline.event", nil, { "grouped" }) 7.6 :add_field("timeline.issue_id", nil, { "grouped" }) 7.7 - :add_field("timeline.initiative_id", nil, { "grouped" }) 7.8 + :add_field("draft.initiative_id", nil, { "grouped" }) 7.9 :add_field("max(timeline.draft_id)", "draft_id") 7.10 :add_field("timeline.suggestion_id", nil, { "grouped" }) 7.11 :add_field("COUNT(*)", "count")
8.1 --- a/config/default.lua Sun Mar 07 15:20:51 2010 +0100 8.2 +++ b/config/default.lua Sun Mar 07 15:36:54 2010 +0100 8.3 @@ -1,5 +1,5 @@ 8.4 config.app_name = "LiquidFeedback" 8.5 -config.app_version = "beta12.3" 8.6 +config.app_version = "beta13" 8.7 8.8 config.app_title = config.app_name .. " (" .. request.get_config_name() .. " environment)" 8.9
9.1 --- a/locale/translations.de.lua Sun Mar 07 15:20:51 2010 +0100 9.2 +++ b/locale/translations.de.lua Sun Mar 07 15:36:54 2010 +0100 9.3 @@ -447,7 +447,7 @@ 9.4 ["This member has rejected to become initiator of this initiative"] = "Dieses Mitglied hat die Einladung, Initiator zu werden, abgelehnt"; 9.5 ["This member is already initiator of this initiative"] = "Dieses Mitglied ist bereits Initiator dieser Initiative"; 9.6 ["This member is already invited to become initiator of this initiative"] = "Dieses Mitglied ist bereits eingeladen Initiator dieser Initiative zu werden"; 9.7 -["This member is participating, the rest of delegation chain is suspended while discussing"] = "Dieses Mitglied partizipiert, Rest der Delegationskette ausgesetzt."; 9.8 +["This member is participating, the rest of delegation chain is suspended while discussing"] = "Dieses Mitglied partizipiert, Rest der Delegationskette während der Diskussion ausgesetzt."; 9.9 ["This name is already taken, please choose another one!"] = "Dieser Name ist bereits vergeben, bitte wähle einen anderen!"; 9.10 ["This name is really too short!"] = "Dieser Name ist wirklich zu kurz!"; 9.11 ["This name is too short!"] = "Dieser Name ist zu kurz!";
10.1 --- a/locale/translations.eo.lua Sun Mar 07 15:20:51 2010 +0100 10.2 +++ b/locale/translations.eo.lua Sun Mar 07 15:36:54 2010 +0100 10.3 @@ -23,7 +23,7 @@ 10.4 ["Accordion (first expanded)"] = "Akordiono (unua apertaj)"; 10.5 ["Accordion (none expanded)"] = "Akordiono (neniu apertaj)"; 10.6 ["Active?"] = "Ĉu aktiva?"; 10.7 -["Add alternative initiative to issue"] = "Aldoni alternativan iniciaton al la temo"; 10.8 +["Add alternative initiative to issue"] = "Aldoni alternativan iniciaton al la temo"; 10.9 ["Add my interest"] = "Anonci mian intereson"; 10.10 ["Add new suggestion"] = "Aldoni novan sugeston"; 10.11 ["Add to my contacts"] = "Aldoni al miaj kontaktoj";