liquid_feedback_frontend
changeset 902:eb16d41929bd
Add support for free timing to policy list and view
author | bsw |
---|---|
date | Tue Aug 21 01:22:14 2012 +0200 (2012-08-21) |
parents | f3d6d08b0125 |
children | dd6c00eb215f |
files | app/main/policy/list.lua app/main/policy/show.lua |
line diff
1.1 --- a/app/main/policy/list.lua Tue Aug 21 01:16:03 2012 +0200 1.2 +++ b/app/main/policy/list.lua Tue Aug 21 01:22:14 2012 +0200 1.3 @@ -38,9 +38,9 @@ 1.4 else 1.5 ui.field.text{ label = _"New" .. ":", value = "≤ " .. policy.admission_time } 1.6 end 1.7 - ui.field.text{ label = _"Discussion" .. ":", value = policy.discussion_time } 1.8 - ui.field.text{ label = _"Frozen" .. ":", value = policy.verification_time } 1.9 - ui.field.text{ label = _"Voting" .. ":", value = policy.voting_time } 1.10 + ui.field.text{ label = _"Discussion" .. ":", value = policy.discussion_time or _"variable" } 1.11 + ui.field.text{ label = _"Frozen" .. ":", value = policy.verification_time or _"variable" } 1.12 + ui.field.text{ label = _"Voting" .. ":", value = policy.voting_time or _"variable" } 1.13 end 1.14 }, 1.15 {
2.1 --- a/app/main/policy/show.lua Tue Aug 21 01:16:03 2012 +0200 2.2 +++ b/app/main/policy/show.lua Tue Aug 21 01:22:14 2012 +0200 2.3 @@ -11,10 +11,10 @@ 2.4 else 2.5 ui.field.text{ label = _"New" .. ":", value = "≤ " .. policy.admission_time } 2.6 end 2.7 - ui.field.text{ label = _"Discussion", value = policy.discussion_time } 2.8 - ui.field.text{ label = _"Frozen", value = policy.verification_time } 2.9 - ui.field.text{ label = _"Voting", value = policy.voting_time } 2.10 - 2.11 + ui.field.text{ label = _"Discussion" .. ":", value = policy.discussion_time or _"variable" } 2.12 + ui.field.text{ label = _"Frozen" .. ":", value = policy.verification_time or _"variable" } 2.13 + ui.field.text{ label = _"Voting" .. ":", value = policy.voting_time or _"variable" } 2.14 + 2.15 if policy.polling then 2.16 ui.field.text{ label = _"Issue quorum" .. ":", value = _"without" } 2.17 else