66ee0ef6c2
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=himorin, r=glob git-svn-id: svn://10.0.0.236/trunk@245277 18797224-902f-48f8-a5cc-f745e15eee43
79 lines
2.6 KiB
Cheetah
79 lines
2.6 KiB
Cheetah
[%# The contents of this file are subject to the Mozilla Public
|
|
# License Version 1.1 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.mozilla.org/MPL/
|
|
#
|
|
# Software distributed under the License is distributed on an "AS
|
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
# implied. See the License for the specific language governing
|
|
# rights and limitations under the License.
|
|
#
|
|
# The Original Code is the Bugzilla Bug Tracking System.
|
|
#
|
|
# The Initial Developer of the Original Code is Netscape Communications
|
|
# Corporation. Portions created by Netscape are
|
|
# Copyright (C) 1998 Netscape Communications Corporation. All
|
|
# Rights Reserved.
|
|
#
|
|
# Contributor(s): Myk Melez <myk@mozilla.org>
|
|
# Frédéric Buclin <LpSolit@gmail.com>
|
|
#%]
|
|
|
|
[%# INTERFACE:
|
|
# operations: array; bug activity since the user last displayed the attachment form,
|
|
# used by bug/activity/table.html.tmpl to display recent changes that will
|
|
# be overwritten if the user submits these changes. See that template
|
|
# for further documentation.
|
|
# attachment: object; the attachment being changed.
|
|
#%]
|
|
|
|
[%# The global Bugzilla->cgi object is used to obtain form variable values. %]
|
|
[% USE Bugzilla %]
|
|
[% cgi = Bugzilla.cgi %]
|
|
|
|
[% PROCESS global/variables.none.tmpl %]
|
|
[% PROCESS global/header.html.tmpl title = "Mid-air collision!" %]
|
|
|
|
<h1>Mid-air collision detected!</h1>
|
|
|
|
<p>
|
|
Someone else has made changes to
|
|
<a href="attachment.cgi?id=[% attachment.id %]&action=edit">attachment [% attachment.id %]</a>
|
|
of [% "$terms.bug $attachment.bug_id" FILTER bug_link(attachment.bug_id) FILTER none %]
|
|
at the same time you were trying to. The changes made were:
|
|
</p>
|
|
|
|
<p>
|
|
[% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %]
|
|
</p>
|
|
|
|
[% IF cgi.param("comment") %]
|
|
<p>
|
|
Your comment was:<br>
|
|
<blockquote><pre class="bz_comment_text">
|
|
[% cgi.param("comment") FILTER wrap_comment FILTER html %]
|
|
</pre></blockquote>
|
|
</p>
|
|
[% END %]
|
|
|
|
<p>
|
|
You have the following choices:
|
|
</p>
|
|
|
|
<ul>
|
|
<li>
|
|
<form method="post" action="attachment.cgi">
|
|
[% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
|
|
<input type="submit" id="process" value="Submit my changes anyway">
|
|
This will cause all of the above changes to be overwritten.
|
|
</form>
|
|
</li>
|
|
<li>
|
|
Throw away my changes, and
|
|
<a href="attachment.cgi?id=[% attachment.id %]&action=edit">revisit
|
|
attachment [% attachment.id %]</a>
|
|
</li>
|
|
</ul>
|
|
|
|
[% PROCESS global/footer.html.tmpl %]
|