summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
diff options
context:
space:
mode:
authortravis%sedsystems.ca <>2005-03-01 03:55:06 +0100
committertravis%sedsystems.ca <>2005-03-01 03:55:06 +0100
commit7962c876e52a2812cd6ab00be1c9cdabc05000ec (patch)
tree291be7536702ba45c21dd883a410b574a90af5ad /template/en/default/global
parent8b0a6508c4daa8a56d17192a9c3a1d9b53790e15 (diff)
downloadbugzilla-7962c876e52a2812cd6ab00be1c9cdabc05000ec.tar.gz
bugzilla-7962c876e52a2812cd6ab00be1c9cdabc05000ec.tar.xz
Bug 283139 : Zero out 'hours remaining' field on certain state transitions r.t. throwing an error saying it's not zeroed out.
Patch by Shane H. W. Travis <travis@sedsystems.ca> r=LpSolit a=justdave
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/messages.html.tmpl7
-rw-r--r--template/en/default/global/user-error.html.tmpl5
2 files changed, 7 insertions, 5 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index b007af2e1..ba1476300 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -25,6 +25,8 @@
[% PROCESS global/variables.none.tmpl %]
+[% PROCESS "global/field-descs.none.tmpl" %]
+
[% message_tag = message %]
[% message = BLOCK %]
@@ -141,6 +143,11 @@
or you don't have access to it. The following is a list of the
products you can choose from.
+ [% ELSIF message_tag == "remaining_time_zeroed" %]
+ The [% field_descs.remaining_time FILTER html %] field has been
+ set to zero automatically as part of marking this [% terms.bug %]
+ as either RESOLVED or CLOSED.
+
[% ELSIF message_tag == "series_created" %]
[% title = "Series Created" %]
The series <em>[% series.category FILTER html %] /
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 47dcaca10..e0d43b5b1 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -940,11 +940,6 @@
[% title = "Summary Needed" %]
You must enter a summary for this [% terms.bug %].
- [% ELSIF error == "resolving_remaining_time" %]
- [% title = "Trying to Resolve with Hours Remaining" %]
- You cannot resolve [% terms.abug %] with hours still remaining. Set
- Remaining Hours to zero if you want to resolve the [% terms.bug %].
-
[% ELSIF error == "sanity_check_access_denied" %]
[% title = "Access Denied" %]
You do not have the permissions necessary to run a sanity check.