summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/workflow/edit.html.tmpl2
-rw-r--r--template/en/default/global/user-error.html.tmpl13
2 files changed, 10 insertions, 5 deletions
diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl
index 5f2b21263..7fdcb3577 100644
--- a/template/en/default/admin/workflow/edit.html.tmpl
+++ b/template/en/default/admin/workflow/edit.html.tmpl
@@ -68,7 +68,7 @@
</th>
[% FOREACH new_status = statuses %]
- [% IF status.id != new_status.id && (status.id || new_status.is_open) %]
+ [% IF status.id != new_status.id %]
[% checked = workflow.${status.id}.${new_status.id}.defined ? 1 : 0 %]
[% mandatory = (status.id && new_status.name == Param("duplicate_or_move_bug_status")) ? 1 : 0 %]
<td align="center" class="checkbox-cell[% " checked" IF checked || mandatory %]"
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index dc0481a67..387a7df03 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -308,9 +308,10 @@
[% ELSIF error == "comment_required" %]
[% title = "Comment Required" %]
You have to specify a
- [% IF old && new %]
- <b>comment</b> when changing the status of [% terms.abug %] from
- [%+ old.name FILTER html %] to [% new.name FILTER html %].
+ [% IF old.defined && new.defined %]
+ <b>comment</b> when changing the [% field_descs.$field FILTER html %]
+ of [% terms.abug %] from [% (old || "(empty)") FILTER html %]
+ to [% (new || "(empty)") FILTER html %].
[% ELSIF new %]
description for this [% terms.bug %].
[% ELSE %]
@@ -1527,7 +1528,11 @@
[% ELSIF error == "still_unresolved_bugs" %]
[% title = "Unresolved Dependencies" %]
- [% terms.Bug %] [%+ bug_id FILTER bug_link(bug_id) FILTER none %]
+ [% IF bug_id %]
+ [% terms.Bug %] [%+ bug_id FILTER bug_link(bug_id) FILTER none %]
+ [% ELSE %]
+ This [% terms.bug %]
+ [% END %]
has [% dep_count FILTER none %] unresolved
[% IF dep_count == 1 %]
dependency