From ba4585ae8a1c63a49e40461d2e2efc12bc75c58a Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Mon, 5 Jul 2010 17:42:57 -0700 Subject: Bug 486292: Change the default workflow to UNCONFIRMED, CONFIRMED, IN_PROGRESS, RESOLVED, VERIFIED. r=LpSolit, a=mkanat --- template/en/default/pages/fields.html.tmpl | 52 ++++++------------------- template/en/default/pages/quicksearch.html.tmpl | 4 +- 2 files changed, 13 insertions(+), 43 deletions(-) (limited to 'template/en/default/pages') diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl index de089ec11..d97a40f96 100644 --- a/template/en/default/pages/fields.html.tmpl +++ b/template/en/default/pages/fields.html.tmpl @@ -65,49 +65,33 @@ Nobody has confirmed that this [% terms.bug %] is valid. Users who have the "canconfirm" permission set may confirm this [% terms.bug %], changing its state to - [% display_value("bug_status", "NEW") FILTER html %]. + [% display_value("bug_status", "CONFIRMED") FILTER html %]. Or, it may be directly resolved and marked [% display_value("bug_status", "RESOLVED") FILTER html %].
- [% display_value("bug_status", "NEW") FILTER html %] + [% display_value("bug_status", "CONFIRMED") FILTER html %]
This [% terms.bug %] is valid and has recently been filed. [%+ terms.Bugs %] in this state become - [% display_value("bug_status", "ASSIGNED") FILTER html %] when - somebody is working on them, or become resolved and marked + [% display_value("bug_status", "IN_PROGRESS") FILTER html %] + when somebody is working on them, or become resolved and marked [% display_value("bug_status", "RESOLVED") FILTER html %].
- [% display_value("bug_status", "ASSIGNED") FILTER html %] + [% display_value("bug_status", "IN_PROGRESS") FILTER html %]
This [% terms.bug %] is not yet resolved, but is assigned to the proper person who is working on the [% terms.bug %]. From here, [%+ terms.bugs %] can be given to another person and become - [% display_value("bug_status", "NEW") FILTER html %], or + [% display_value("bug_status", "CONFIRMED") FILTER html %], or resolved and become [% display_value("bug_status", "RESOLVED") FILTER html %].
- -
- [% display_value("bug_status", "REOPENED") FILTER html %] -
-
- This [% terms.bug %] was once resolved, but the resolution was - deemed incorrect. For example, a - [% display_value("resolution", "WORKSFORME") FILTER html %] - [%+ terms.bug %] is marked - [% display_value("bug_status", "REOPENED") FILTER html %] when - more information shows up and the [% terms.bug %] is now - reproducible. From here, [% terms.bugs %] are either marked - [% display_value("bug_status", "ASSIGNED") FILTER html %] or - [% display_value("bug_status", "RESOLVED") FILTER html %]. -
- @@ -128,11 +112,9 @@
A resolution has been performed, and it is awaiting verification by - QA. From here [% terms.bugs %] are either re-opened and become - [% display_value("bug_status", "REOPENED") FILTER html %], are - marked [% display_value("bug_status", "VERIFIED") FILTER html %], - or are closed for good and marked - [% display_value("bug_status", "CLOSED") FILTER html %]. + QA. From here [% terms.bugs %] are either reopened and given some + open status, or are verified by QA and marked + [% display_value("bug_status", "VERIFIED") FILTER html %].
@@ -140,20 +122,8 @@
QA has looked at the [% terms.bug %] and the resolution and - agrees that the appropriate resolution has been taken. - [%+ terms.Bugs %] remain in this state until the product they were - reported against actually ships, at which point they become - [% display_value("bug_status", "CLOSED") FILTER html %]. -
- -
- [% display_value("bug_status", "CLOSED") FILTER html %] -
-
- The [% terms.bug %] is considered dead, the resolution is correct. - Any zombie [% terms.bugs %] who choose to walk the earth again must - do so by becoming - [% display_value("bug_status", "REOPENED") FILTER html %]. + agrees that the appropriate resolution has been taken. This is + the final staus for bugs.
diff --git a/template/en/default/pages/quicksearch.html.tmpl b/template/en/default/pages/quicksearch.html.tmpl index 1a630671d..486261009 100644 --- a/template/en/default/pages/quicksearch.html.tmpl +++ b/template/en/default/pages/quicksearch.html.tmpl @@ -97,8 +97,8 @@

You can specify any of these fields like field:value in the search box, to search on them. You can also abbreviate the field name, as long as your abbreviation matches only one field name. - So, for example, searching on stat:NEW will find all - [%+ terms.bugs %] in the NEW status. Some fields have + So, for example, searching on stat:VERIFIED will find all + [%+ terms.bugs %] in the VERIFIED status. Some fields have multiple names, and you can use any of those names to search for them.

[% IF Bugzilla.active_custom_fields.size %] -- cgit v1.2.3-24-g4f1b