# HG changeset patch
# User bsw
# Date 1337630449 -7200
# Node ID 3e4f6534bb151d8e5b367ee465341ecd3e19953a
# Parent  c92e2f2dcc2e6086dbbf7f911dc402b8b8b4786e# Parent  79710861a3c30558e9adf628e5e8c81f3bbb6689
merge

diff -r c92e2f2dcc2e -r 3e4f6534bb15 app/main/admin/_action/member_update.lua
diff -r c92e2f2dcc2e -r 3e4f6534bb15 app/main/admin/member_edit.lua
diff -r c92e2f2dcc2e -r 3e4f6534bb15 app/main/admin/member_list.lua
diff -r c92e2f2dcc2e -r 3e4f6534bb15 app/main/index/index.lua
diff -r c92e2f2dcc2e -r 3e4f6534bb15 app/main/initiative/_list_element.lua
--- a/app/main/initiative/_list_element.lua	Mon May 21 21:30:58 2012 +0200
+++ b/app/main/initiative/_list_element.lua	Mon May 21 22:00:49 2012 +0200
@@ -38,10 +38,16 @@
       end
     else
       local max_value = initiative.issue.population or 0
+      local quorum
+      if initiative.issue.accepted then
+        quorum = initiative.issue.policy.initiative_quorum_num / initiative.issue.policy.initiative_quorum_den
+      else
+        quorum = initiative.issue.policy.issue_quorum_num / initiative.issue.policy.issue_quorum_den
+      end
       ui.bargraph{
         max_value = max_value,
         width = 100,
-        quorum = max_value * (initiative.issue.policy.initiative_quorum_num / initiative.issue.policy.initiative_quorum_den),
+        quorum = max_value * quorum,
         quorum_color = "#00F",
         bars = {
           { color = "#0a0", value = (initiative.satisfied_supporter_count or 0) },
@@ -116,4 +122,4 @@
         
   end }
 
-end }
\ No newline at end of file
+end }
diff -r c92e2f2dcc2e -r 3e4f6534bb15 app/main/issue/_details.lua
diff -r c92e2f2dcc2e -r 3e4f6534bb15 app/main/member/_profile.lua