diff options
author | lpsolit%gmail.com <> | 2007-04-11 00:33:10 +0200 |
---|---|---|
committer | lpsolit%gmail.com <> | 2007-04-11 00:33:10 +0200 |
commit | edcc538e961a21c18566bf71fea02c0ef5bbd256 (patch) | |
tree | 95e8a888d9fbbba60eb6e0774dfcfcf6c87866f4 /template/en/default/bug | |
parent | 8918a55e52c9badc177a791a4e70b1033c6615b7 (diff) | |
download | bugzilla-edcc538e961a21c18566bf71fea02c0ef5bbd256.tar.gz bugzilla-edcc538e961a21c18566bf71fea02c0ef5bbd256.tar.xz |
Bug 377026: Replace all occurences of status_descs.FOO by get_status("FOO") (next step in supporting custom bug statuses) - Patch by Frédéric Buclin <LpSolit@gmail.com> r=gerv a=LpSolit
Diffstat (limited to 'template/en/default/bug')
-rw-r--r-- | template/en/default/bug/activity/table.html.tmpl | 4 | ||||
-rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 4 | ||||
-rw-r--r-- | template/en/default/bug/knob.html.tmpl | 16 | ||||
-rw-r--r-- | template/en/default/bug/show-multiple.html.tmpl | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 5bfb79f37..b15925555 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -83,7 +83,7 @@ change.fieldname == 'work_time' %] [% PROCESS formattimeunit time_unit=change.removed %] [% ELSIF change.fieldname == 'bug_status' %] - [% status_descs.${change.removed} FILTER html %] + [% get_status(change.removed) FILTER html %] [% ELSIF change.fieldname == 'resolution' %] [% get_resolution(change.removed) FILTER html %] [% ELSIF change.fieldname == 'blocked' || @@ -103,7 +103,7 @@ change.fieldname == 'work_time' %] [% PROCESS formattimeunit time_unit=change.added %] [% ELSIF change.fieldname == 'bug_status' %] - [% status_descs.${change.added} FILTER html %] + [% get_status(change.added) FILTER html %] [% ELSIF change.fieldname == 'resolution' %] [% get_resolution(change.added) FILTER html %] [% ELSIF change.fieldname == 'blocked' || diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index fc6024a9e..af7285cac 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -264,7 +264,7 @@ function handleWantsAttachment(wants_attachment) { <input type="hidden" name="bug_status" value="[% default.bug_status FILTER html %]"> <td align="right" valign="top"><strong>Initial State:</strong></td> - <td valign="top">[% status_descs.${default.bug_status} FILTER html %]</td> + <td valign="top">[% get_status(default.bug_status) FILTER html %]</td> [% ELSE %] [% sel = { description => 'Initial State', name => 'bug_status' } %] [% INCLUDE select %] @@ -600,7 +600,7 @@ function handleWantsAttachment(wants_attachment) { <option value="[% x FILTER html %]" [% " selected=\"selected\"" IF x == default.${sel.name} %]> [% IF sel.name == "bug_status" %] - [% status_descs.$x FILTER html %] + [% get_status(x) FILTER html %] [% ELSE %] [% x FILTER html %] [% END %]</option> diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl index 03084ddd4..12f1adf65 100644 --- a/template/en/default/bug/knob.html.tmpl +++ b/template/en/default/bug/knob.html.tmpl @@ -35,7 +35,7 @@ [% PROCESS initial_action %] <input type="radio" id="knob-confirm" name="knob" value="confirm"> <label for="knob-confirm"> - Confirm [% terms.bug %] (change status to <b>[% status_descs.NEW FILTER html %]</b>) + Confirm [% terms.bug %] (change status to <b>[% get_status("NEW") FILTER html %]</b>) </label> <br> [% knum = knum + 1 %] @@ -48,7 +48,7 @@ <label for="knob-accept"> Accept [% terms.bug %] ( [% IF bug.isunconfirmed %]confirm [% terms.bug %], and [% END %]change - status to <b>[% status_descs.ASSIGNED FILTER html %]</b>) + status to <b>[% get_status("ASSIGNED") FILTER html %]</b>) </label> <br> [% knum = knum + 1 %] @@ -61,7 +61,7 @@ <input type="radio" id="knob-clear" name="knob" value="clearresolution"> <label for="knob-clear"> Clear the resolution (remove the current resolution of - <b>[% resolution_descs.${bug.resolution} FILTER html %]</b>) + <b>[% get_resolution(bug.resolution) FILTER html %]</b>) </label> <br> [% knum = knum + 1 %] @@ -97,7 +97,7 @@ [% IF bug.isunconfirmed && bug.user.canconfirm %] <input type="checkbox" id="andconfirm" name="andconfirm"> <label for="andconfirm"> - and confirm [% terms.bug %] (change status to <b>[% status_descs.NEW FILTER html %]</b>) + and confirm [% terms.bug %] (change status to <b>[% get_status("NEW") FILTER html %]</b>) </label> <br> [% END %] @@ -113,7 +113,7 @@ [% IF bug.isunconfirmed && bug.user.canconfirm %] <input type="checkbox" id="compconfirm" name="compconfirm"> <label for="compconfirm"> - and confirm [% terms.bug %] (change status to <b>[% status_descs.NEW FILTER html %]</b>) + and confirm [% terms.bug %] (change status to <b>[% get_status("NEW") FILTER html %]</b>) </label> <br> [% END %] @@ -142,7 +142,7 @@ [% PROCESS initial_action %] <input type="radio" id="knob-verify" name="knob" value="verify"> <label for="knob-verify"> - Mark [% terms.bug %] as <b>[% status_descs.VERIFIED FILTER html %]</b> + Mark [% terms.bug %] as <b>[% get_status("VERIFIED") FILTER html %]</b> </label> <br> [% knum = knum + 1 %] @@ -151,7 +151,7 @@ [% PROCESS initial_action %] <input type="radio" id="knob-close" name="knob" value="close"> <label for="knob-close"> - Mark [% terms.bug %] as <b>[% status_descs.CLOSED FILTER html %]</b> + Mark [% terms.bug %] as <b>[% get_status("CLOSED") FILTER html %]</b> </label> <br> [% knum = knum + 1 %] @@ -177,7 +177,7 @@ [% IF !initial_action_shown %] <input type="radio" id="knob-leave" name="knob" value="none" checked="checked"> <label for="knob-leave"> - Leave as <b>[% status_descs.${bug.bug_status} FILTER html %] + Leave as <b>[% get_status(bug.bug_status) FILTER html %] [% get_resolution(bug.resolution) FILTER html %]</b> </label> <br> diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index d9dc627d2..50256965c 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -117,7 +117,7 @@ <tr> <th>[% field_descs.bug_status FILTER html %]:</th> <td> - [% status_descs.${bug.bug_status} FILTER html %] + [% get_status(bug.bug_status) FILTER html %] [%+ get_resolution(bug.resolution) FILTER html %] </td> |