diff options
| author | lpsolit%gmail.com <> | 2007-05-27 05:27:45 +0200 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2007-05-27 05:27:45 +0200 |
| commit | 2bd57ce8e6f2c2bb59a99d825fc9d181ea2cb4a5 (patch) | |
| tree | 6bd15d0b6062217eaf3e7f82eaff89f75715f702 /template/en/default/admin/workflow | |
| parent | 9e81bb0333048f6066610f66614a1ef163917137 (diff) | |
| download | bugzilla-2bd57ce8e6f2c2bb59a99d825fc9d181ea2cb4a5.tar.gz bugzilla-2bd57ce8e6f2c2bb59a99d825fc9d181ea2cb4a5.tar.xz | |
Bug 344965: Fix process_bug.cgi and bug/* templates to work with custom bug status workflow - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=LpSolit
Diffstat (limited to 'template/en/default/admin/workflow')
| -rw-r--r-- | template/en/default/admin/workflow/comment.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/admin/workflow/edit.html.tmpl | 16 |
2 files changed, 14 insertions, 10 deletions
diff --git a/template/en/default/admin/workflow/comment.html.tmpl b/template/en/default/admin/workflow/comment.html.tmpl index 5e9a788d6..df9d5e872 100644 --- a/template/en/default/admin/workflow/comment.html.tmpl +++ b/template/en/default/admin/workflow/comment.html.tmpl @@ -50,24 +50,24 @@ <th> </th> [% FOREACH status = statuses %] <th class="col-header[% status.is_open ? " open-status" : " closed-status" %]"> - [% status.value FILTER html %] + [% status.name FILTER html %] </th> [% END %] </tr> [%# This defines the entry point in the workflow %] - [% p = [{id => 0, value => "{Start}", is_open => 1}] %] + [% p = [{id => 0, name => "{Start}", is_open => 1}] %] [% FOREACH status = p.merge(statuses) %] <tr class="highlight"> <th align="right" class="[% status.is_open ? "open-status" : "closed-status" %]"> - [% status.value FILTER html %] + [% status.name FILTER html %] </th> [% FOREACH new_status = statuses %] [% IF workflow.${status.id}.${new_status.id}.defined %] <td align="center" class="checkbox-cell [% " checked" IF workflow.${status.id}.${new_status.id} %]" - title="From [% status.value FILTER html %] to [% new_status.value FILTER html %]"> + title="From [% status.name FILTER html %] to [% new_status.name FILTER html %]"> <input type="checkbox" name="c_[% status.id %]_[% new_status.id %]" id="c_[% status.id %]_[% new_status.id %]" onclick="toggle_cell(this)" [% " checked='checked'" IF workflow.${status.id}.${new_status.id} %]> diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl index dee71c0a1..d602171a1 100644 --- a/template/en/default/admin/workflow/edit.html.tmpl +++ b/template/en/default/admin/workflow/edit.html.tmpl @@ -34,8 +34,12 @@ </script> <p> - This page allows you to define which status transitions are valid - in your workflow. + This page allows you to define which status transitions are valid in your workflow. + For compatibility with older versions of [% terms.Bugzilla %], reopening [% terms.abug %] + will only display either UNCONFIRMED or REOPENED (if allowed by your workflow) but not + both. The decision depends on whether the [% terms.bug %] has ever been confirmed or not. + So it is a good idea to allow both transitions and let [% terms.Bugzilla %] select the + correct one. </p> <form id="workflow_form" method="POST" action="editworkflow.cgi"> @@ -50,24 +54,24 @@ <th> </th> [% FOREACH status = statuses %] <th class="col-header[% status.is_open ? " open-status" : " closed-status" %]"> - [% status.value FILTER html %] + [% status.name FILTER html %] </th> [% END %] </tr> [%# This defines the entry point in the workflow %] - [% p = [{id => 0, value => "{Start}", is_open => 1}] %] + [% p = [{id => 0, name => "{Start}", is_open => 1}] %] [% FOREACH status = p.merge(statuses) %] <tr class="highlight"> <th align="right" class="[% status.is_open ? "open-status" : "closed-status" %]"> - [% status.value FILTER html %] + [% status.name FILTER html %] </th> [% FOREACH new_status = statuses %] [% IF status.id != new_status.id %] <td align="center" class="checkbox-cell [% " checked" IF workflow.${status.id}.${new_status.id}.defined %]" - title="From [% status.value FILTER html %] to [% new_status.value FILTER html %]"> + title="From [% status.name FILTER html %] to [% new_status.name FILTER html %]"> <input type="checkbox" name="w_[% status.id %]_[% new_status.id %]" id="w_[% status.id %]_[% new_status.id %]" onclick="toggle_cell(this)" [% " checked='checked'" IF workflow.${status.id}.${new_status.id}.defined %]> |