diff options
| author | mkanat%bugzilla.org <> | 2008-01-20 09:22:25 +0100 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2008-01-20 09:22:25 +0100 |
| commit | b30573c8373fe6fd6438e161efc9201e680e1285 (patch) | |
| tree | 6d1be8102f9d2678f1486c5b2b981022030e57fb /template/en/default/bug | |
| parent | e4666b62480a4fa2e36493ce0315b76b7b759073 (diff) | |
| download | bugzilla-b30573c8373fe6fd6438e161efc9201e680e1285.tar.gz bugzilla-b30573c8373fe6fd6438e161efc9201e680e1285.tar.xz | |
Bug 412836: Clean up process_bug.cgi now that we have Bugzilla::Bug->update
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
Diffstat (limited to 'template/en/default/bug')
| -rw-r--r-- | template/en/default/bug/process/midair.html.tmpl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index 3d76e1754..31dbc7b3c 100644 --- a/template/en/default/bug/process/midair.html.tmpl +++ b/template/en/default/bug/process/midair.html.tmpl @@ -28,7 +28,7 @@ # entered a comment along with their change) or a number less than that # (if they didn't), in which case no comments are displayed. # comments: array; all the comments on the bug. - # bug_id: number; the ID of the bug being changed. + # bug: Bugzilla::Bug; the bug being changed. #%] [%# The global Bugzilla->cgi object is used to obtain form variable values. %] @@ -45,7 +45,7 @@ <p> Someone else has made changes to - [%+ "$terms.bug $bug_id" FILTER bug_link(bug_id) FILTER none %] + [%+ "$terms.bug $bug.id" FILTER bug_link(bug.id) FILTER none %] at the same time you were trying to. The changes made were: </p> @@ -58,7 +58,7 @@ <p> Added the comment(s): <blockquote> - [% PROCESS "bug/comments.html.tmpl" bug = { 'bug_id' => bug_id } %] + [% PROCESS "bug/comments.html.tmpl" %] </blockquote> </p> [% END %] @@ -77,7 +77,10 @@ You have the following choices: <ul> <li> <form method="post" action="process_bug.cgi"> - [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %] + <input type="hidden" name="delta_ts" + value="[% bug.delta_ts FILTER html %]"> + [% PROCESS "global/hidden-fields.html.tmpl" + exclude="^Bugzilla_login|Bugzilla_password|delta_ts$" %] <input type="submit" id="process" value="Submit my changes anyway"> This will cause all of the above changes to be overwritten [% ", except for the added comment(s)" IF comments.size > start_at %]. @@ -85,7 +88,7 @@ You have the following choices: </li> <li> Throw away my changes, and - [%+ "revisit $terms.bug $bug_id" FILTER bug_link(bug_id) FILTER none %] + [%+ "revisit $terms.bug $bug.id" FILTER bug_link(bug.id) FILTER none %] </li> </ul> |