diff options
| author | jocuri%softhome.net <> | 2004-11-20 21:17:28 +0100 |
|---|---|---|
| committer | jocuri%softhome.net <> | 2004-11-20 21:17:28 +0100 |
| commit | 6d44951fb4cb566d6d36704abeed9399767cab66 (patch) | |
| tree | 161daa5a4d98674c684c69ada99c45bc30f3febc | |
| parent | e26bce249cdea0bc3845b6bb047eb6a8f09fb0d1 (diff) | |
| download | bugzilla-6d44951fb4cb566d6d36704abeed9399767cab66.tar.gz bugzilla-6d44951fb4cb566d6d36704abeed9399767cab66.tar.xz | |
Patch for bug 267494: 'Voter' column should not appear in email preferences if param(usevotes) is false; patch by Shane H. W. Travis <travis@sedsystems.ca>, r=vladd, a=justdave.
| -rw-r--r-- | template/en/default/account/prefs/email.html.tmpl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index 167954683..ded4d30e3 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -18,6 +18,7 @@ # # Contributor(s): Gervase Markham <gerv@gerv.net> # Myk Melez <myk@mozilla.org> + # Shane H. W. Travis <travis@sedsystems.ca> #%] [%# INTERFACE: @@ -35,6 +36,7 @@ [% PROCESS global/variables.none.tmpl %] [% useqacontact = Param('useqacontact') %] +[% usevotes = Param('usevotes') %] <table> [% IF Param('supportwatchers') %] @@ -140,7 +142,7 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb <table width="100%" border="1"> <tr> - <td colspan="[% useqacontact ? '5' : '4' %]" align="center" width="50%"> + <td colspan="[% (useqacontact AND usevotes) ? '5' : ((useqacontact OR usevotes) ? '4' : '3') %]" align="center" width="50%"> <b>When my relationship to this [% terms.bug %] is:</b> </td> <td rowspan="2" width="50%"> @@ -163,9 +165,11 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb <td align="center" width="10%"> <b>CC</b> </td> - <td align="center" width="10%"> - <b>Voter</b> - </td> + [% IF usevotes %] + <td align="center" width="10%"> + <b>Voter</b> + </td> + [% END %] </tr> [% bugLabelLower = BLOCK %] @@ -196,6 +200,7 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ] %] [% NEXT IF role == "QAcontact" AND NOT useqacontact %] + [% NEXT IF role == "Voter" AND NOT usevotes %] <td align="center"> <input type="checkbox" name="email[% role %][% reason.name %]" value="on" [% " checked" IF $role.${reason.name} %]> |