# HG changeset patch
# User bsw
# Date 1267972614 -3600
# Node ID 53a45356c107a2abc4a7e1424721389f94b5d807
# Parent  ca3a0552927fd9f138b787b456f2b55a2416effd
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

diff -r ca3a0552927f -r 53a45356c107 app/main/index/index.lua
--- a/app/main/index/index.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/app/main/index/index.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -197,7 +197,9 @@
 end
 
 local initiatives_selector = Initiative:new_selector()
+  :join("issue", "_issue_state", "_issue_state.id = initiative.issue_id")
   :join("initiator", nil, { "initiator.initiative_id = initiative.id AND initiator.member_id = ? AND initiator.accepted ISNULL", app.session.member.id })
+  :add_where("_issue_state.closed ISNULL AND _issue_state.half_frozen ISNULL")
 
 if initiatives_selector:count() > 0 then
   ui.container{
diff -r ca3a0552927f -r 53a45356c107 app/main/initiative/_show.lua
--- a/app/main/initiative/_show.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/app/main/initiative/_show.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -72,7 +72,7 @@
   }
 end
 
-if initiator and initiator.accepted == nil then
+if initiator and initiator.accepted == nil and not initiative.issue.half_frozen and not initiative.issue.closed then
   ui.container{
     attr = { class = "initiator_invite_info" },
     content = function()
diff -r ca3a0552927f -r 53a45356c107 app/main/initiative/_suggestions.lua
--- a/app/main/initiative/_suggestions.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/app/main/initiative/_suggestions.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -1,6 +1,6 @@
 local initiative = param.get("initiative", "table")
 
-if not initiative.issue.fully_frozen and not initiative.issue.closed and not initiative.revoked then
+if not initiative.issue.half_frozen and not initiative.issue.closed and not initiative.revoked then
   ui.link{
     content = function()
       ui.image{ static = "icons/16/comment_add.png" }
diff -r ca3a0552927f -r 53a45356c107 app/main/issue/show_tab.lua
--- a/app/main/issue/show_tab.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/app/main/issue/show_tab.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -18,6 +18,7 @@
 local voting_requests_selector = issue:get_reference_selector("interested_members_snapshot")
   :join("issue", nil, "issue.id = direct_interest_snapshot.issue_id")
   :add_where("direct_interest_snapshot.voting_requested = false")
+  :add_where("direct_interest_snapshot.event = issue.latest_snapshot_event")
 
 local delegations_selector = issue:get_reference_selector("delegations")
 
diff -r ca3a0552927f -r 53a45356c107 app/main/member/list.lua
--- a/app/main/member/list.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/app/main/member/list.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -2,8 +2,11 @@
 
 util.help("member.list")
 
+local members_selector = Member:new_selector()
+  :add_where("active")
+
 execute.view{
   module = "member",
   view = "_list",
-  params = { members_selector = Member:new_selector() }
+  params = { members_selector = members_selector }
 }
diff -r ca3a0552927f -r 53a45356c107 app/main/suggestion/_action/add.lua
--- a/app/main/suggestion/_action/add.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/app/main/suggestion/_action/add.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -25,8 +25,8 @@
 if issue.closed then
   slot.put_into("error", _"This issue is already closed.")
   return false
-elseif issue.fully_frozen then 
-  slot.put_into("error", _"Voting for this issue has already begun.")
+elseif issue.half_frozen then 
+  slot.put_into("error", _"This issue is already frozen.")
   return false
 end
 
diff -r ca3a0552927f -r 53a45356c107 app/main/timeline/index.lua
--- a/app/main/timeline/index.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/app/main/timeline/index.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -300,7 +300,7 @@
           :add_field("max(timeline.occurrence)", "occurrence")
           :add_field("timeline.event", nil,  { "grouped" })
           :add_field("timeline.issue_id", nil, { "grouped" })
-          :add_field("timeline.initiative_id", nil, { "grouped" })
+          :add_field("draft.initiative_id", nil, { "grouped" })
           :add_field("max(timeline.draft_id)", "draft_id")
           :add_field("timeline.suggestion_id", nil, { "grouped" })
           :add_field("COUNT(*)", "count")
diff -r ca3a0552927f -r 53a45356c107 config/default.lua
--- a/config/default.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/config/default.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -1,5 +1,5 @@
 config.app_name = "LiquidFeedback"
-config.app_version = "beta12.3"
+config.app_version = "beta13"
 
 config.app_title = config.app_name .. " (" .. request.get_config_name() .. " environment)"
 
diff -r ca3a0552927f -r 53a45356c107 locale/translations.de.lua
--- a/locale/translations.de.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/locale/translations.de.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -447,7 +447,7 @@
 ["This member has rejected to become initiator of this initiative"] = "Dieses Mitglied hat die Einladung, Initiator zu werden, abgelehnt";
 ["This member is already initiator of this initiative"] = "Dieses Mitglied ist bereits Initiator dieser Initiative";
 ["This member is already invited to become initiator of this initiative"] = "Dieses Mitglied ist bereits eingeladen Initiator dieser Initiative zu werden";
-["This member is participating, the rest of delegation chain is suspended while discussing"] = "Dieses Mitglied partizipiert, Rest der Delegationskette ausgesetzt.";
+["This member is participating, the rest of delegation chain is suspended while discussing"] = "Dieses Mitglied partizipiert, Rest der Delegationskette während der Diskussion ausgesetzt.";
 ["This name is already taken, please choose another one!"] = "Dieser Name ist bereits vergeben, bitte wähle einen anderen!";
 ["This name is really too short!"] = "Dieser Name ist wirklich zu kurz!";
 ["This name is too short!"] = "Dieser Name ist zu kurz!";
diff -r ca3a0552927f -r 53a45356c107 locale/translations.eo.lua
--- a/locale/translations.eo.lua	Sun Mar 07 15:20:51 2010 +0100
+++ b/locale/translations.eo.lua	Sun Mar 07 15:36:54 2010 +0100
@@ -23,7 +23,7 @@
 ["Accordion (first expanded)"] = "Akordiono (unua apertaj)";
 ["Accordion (none expanded)"] = "Akordiono (neniu apertaj)";
 ["Active?"] = "Ĉu aktiva?";
-["Add alternative initiative to issue"] = "Aldoni alternativan iniciaton al la temo"; 
+["Add alternative initiative to issue"] = "Aldoni alternativan iniciaton al la temo";
 ["Add my interest"] = "Anonci mian intereson";
 ["Add new suggestion"] = "Aldoni novan sugeston";
 ["Add to my contacts"] = "Aldoni al miaj kontaktoj";