summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2008-10-07 04:09:53 +0200
committerlpsolit%gmail.com <>2008-10-07 04:09:53 +0200
commit28b1029c5c32b0b4711071a9232f461214e645e9 (patch)
tree2b67a1639026f7fc5c52e18c9b5fa3386e0a28d9
parent3e75f78185fb9572c591c5117669d4b392d5cffa (diff)
downloadbugzilla-28b1029c5c32b0b4711071a9232f461214e645e9.tar.gz
bugzilla-28b1029c5c32b0b4711071a9232f461214e645e9.tar.xz
Bug 456782: Rename the "View Current Triggers" link in editworkflow.cgi and update the "Edit Actions Triggered by the Workflow" page title accordingly - Patch by Frédéric Buclin <LpSolit@gmail.com> r=ghendricks a=LpSolit
-rw-r--r--template/en/default/admin/workflow/comment.html.tmpl2
-rw-r--r--template/en/default/admin/workflow/edit.html.tmpl5
2 files changed, 4 insertions, 3 deletions
diff --git a/template/en/default/admin/workflow/comment.html.tmpl b/template/en/default/admin/workflow/comment.html.tmpl
index 8dfdbbf71..2fa78f003 100644
--- a/template/en/default/admin/workflow/comment.html.tmpl
+++ b/template/en/default/admin/workflow/comment.html.tmpl
@@ -17,7 +17,7 @@
[% PROCESS "global/field-descs.none.tmpl" %]
[% INCLUDE global/header.html.tmpl
- title = "Edit Actions Triggered by the Workflow"
+ title = "Comments Required on Status Transitions"
style_urls = ['skins/standard/admin.css']
%]
diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl
index 516d184b9..1328ce005 100644
--- a/template/en/default/admin/workflow/edit.html.tmpl
+++ b/template/en/default/admin/workflow/edit.html.tmpl
@@ -35,7 +35,8 @@
<p>
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
+ will only display either [% get_status("UNCONFIRMED") FILTER html %] or
+ [%+ get_status("REOPENED") FILTER html %] (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.
@@ -101,7 +102,7 @@
<input type="hidden" name="token" value="[% token FILTER html %]">
<input type="submit" value="Commit Changes"> -
<a href="editworkflow.cgi">Cancel Changes</a> -
- <a href="editworkflow.cgi?action=edit_comment">View Current Triggers</a>
+ <a href="editworkflow.cgi?action=edit_comment">View Comments Required on Status Transitions</a>
</p>
</form>