# HG changeset patch # User bsw # Date 1345504934 -7200 # Node ID eb16d41929bdae7d34b5e74f871f3c6608b9c17c # Parent f3d6d08b01258f818bbbf80bd1a44ce7f37e379e Add support for free timing to policy list and view diff -r f3d6d08b0125 -r eb16d41929bd app/main/policy/list.lua --- a/app/main/policy/list.lua Tue Aug 21 01:16:03 2012 +0200 +++ b/app/main/policy/list.lua Tue Aug 21 01:22:14 2012 +0200 @@ -38,9 +38,9 @@ else ui.field.text{ label = _"New" .. ":", value = "≤ " .. policy.admission_time } end - ui.field.text{ label = _"Discussion" .. ":", value = policy.discussion_time } - ui.field.text{ label = _"Frozen" .. ":", value = policy.verification_time } - ui.field.text{ label = _"Voting" .. ":", value = policy.voting_time } + ui.field.text{ label = _"Discussion" .. ":", value = policy.discussion_time or _"variable" } + ui.field.text{ label = _"Frozen" .. ":", value = policy.verification_time or _"variable" } + ui.field.text{ label = _"Voting" .. ":", value = policy.voting_time or _"variable" } end }, { diff -r f3d6d08b0125 -r eb16d41929bd app/main/policy/show.lua --- a/app/main/policy/show.lua Tue Aug 21 01:16:03 2012 +0200 +++ b/app/main/policy/show.lua Tue Aug 21 01:22:14 2012 +0200 @@ -11,10 +11,10 @@ else ui.field.text{ label = _"New" .. ":", value = "≤ " .. policy.admission_time } end - ui.field.text{ label = _"Discussion", value = policy.discussion_time } - ui.field.text{ label = _"Frozen", value = policy.verification_time } - ui.field.text{ label = _"Voting", value = policy.voting_time } - + ui.field.text{ label = _"Discussion" .. ":", value = policy.discussion_time or _"variable" } + ui.field.text{ label = _"Frozen" .. ":", value = policy.verification_time or _"variable" } + ui.field.text{ label = _"Voting" .. ":", value = policy.voting_time or _"variable" } + if policy.polling then ui.field.text{ label = _"Issue quorum" .. ":", value = _"without" } else