blob: f89590df2d6e41cf9d7cf3fd10f52d1b18c6ff98 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
[%# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This Source Code Form is "Incompatible With Secondary Licenses", as
# defined by the Mozilla Public License, v. 2.0.
#%]
[%# INTERFACE:
# operations: array; bug activity since the user last displayed the bug 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.
# comments: array; all the comments on the bug.
# bug: Bugzilla::Bug; the bug being changed.
#%]
[%# The global Bugzilla->cgi object is used to obtain form variable values. %]
[% USE Bugzilla %]
[% cgi = Bugzilla.cgi %]
[% UNLESS header_done %]
[% PROCESS bug/process/header.html.tmpl %]
[% END %]
<h1>Mid-air collision detected!</h1>
<p>
Someone else has made changes to
[%+ "$terms.bug $bug.id" FILTER bug_link(bug) 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 comments.size %]
<p>
Added the comment(s):
<blockquote>
[% PROCESS "bug/comments.html.tmpl" %]
</blockquote>
</p>
[% END %]
[% IF cgi.param("comment") %]
<p>
Your comment was:<br>
<blockquote><pre class="bz_comment_text">
[% cgi.param("comment") FILTER html %]
</pre></blockquote>
</p>
[% END %]
<p>
You have the following choices:
</p>
<ul>
<li>
<form method="post" action="process_bug.cgi">
<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 %].
</form>
</li>
[% IF cgi.param("comment") %]
<li>
<form method="post" action="process_bug.cgi">
<input type="hidden" name="id" value="[% cgi.param("id") FILTER html %]">
<input type="hidden" name="delta_ts" value="[% bug.delta_ts FILTER html %]">
<input type="hidden" name="comment" value="[% cgi.param("comment") FILTER html %]">
<input type="hidden" name="use_markdown" value="[% cgi.param("use_markdown") FILTER html %]">
<input type="hidden" name="comment_is_private"
value="[% cgi.param("comment_is_private") FILTER html %]">
<input type="hidden" name="token" value="[% cgi.param("token") FILTER html %]">
<input type="submit" id="process_comment" value="Submit only my new comment">
</form>
</li>
[% END %]
<li>
Throw away my changes, and
[%+ "revisit $terms.bug $bug.id" FILTER bug_link(bug) FILTER none %]
</li>
</ul>
[% PROCESS global/footer.html.tmpl %]
|
