# HG changeset patch # User bsw # Date 1540384860 -7200 # Node ID 4f4a42bb84ec192cd7d28227ef8829c309728338 # Parent ce00a6d5f610862c44cb8dffecfcdb6bfdeef5e2 Show quora correctly diff -r ce00a6d5f610 -r 4f4a42bb84ec app/main/issue/_sidebar_state.lua --- a/app/main/issue/_sidebar_state.lua Thu Oct 18 17:57:49 2018 +0200 +++ b/app/main/issue/_sidebar_state.lua Wed Oct 24 14:41:00 2018 +0200 @@ -21,24 +21,27 @@ local function quorum_text(policy, quorum) local num local den - + if quorum == 1 then return math.max(policy.issue_quorum or 0, issue.issue_quorum or 0) elseif quorum == 2 then num = policy.initiative_quorum_num den = policy.initiative_quorum_den end - - if num == nil or den == nil then - return 0 + + local quorums = {} + + if num and num > 0 and den == 100 or den == 10 then + table.insert(quorums, _("#{percentage}%", { percentage = num * 100 / den })) + elseif num and num > 0 and den and den > 0 then + table.insert(quorums, num .. "/" .. den) end - - if den == 100 or den == 10 then - return _("#{percentage}%", { percentage = num * 100 / den }) - else - return num .. "/" .. den + + if policy.initiative_quorum then + table.insert(quorums, policy.initiative_quorum) end - + + return table.concat(quorums, " / ") end local phases = { "admission", "discussion", "verification", "voting" }