Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
1cf4971f
Commit
1cf4971f
authored
Nov 15, 2013
by
Frédéric Buclin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 927900: Kill longdesclength
r=dkl a=sgreen
parent
f52df06f
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
26 deletions
+6
-26
email_in.pl
email_in.pl
+0
-1
process_bug.cgi
process_bug.cgi
+3
-6
comments.html.tmpl
template/en/default/bug/comments.html.tmpl
+1
-11
edit.html.tmpl
template/en/default/bug/edit.html.tmpl
+0
-1
midair.html.tmpl
template/en/default/bug/process/midair.html.tmpl
+2
-7
No files found.
email_in.pl
View file @
1cf4971f
...
...
@@ -251,7 +251,6 @@ sub process_bug {
foreach
my
$field
(
keys
%
fields
)
{
$cgi
->
param
(
-
name
=>
$field
,
-
value
=>
$fields
{
$field
});
}
$cgi
->
param
(
'longdesclength'
,
scalar
@
{
$bug
->
comments
});
$cgi
->
param
(
'token'
,
issue_hash_token
([
$bug
->
id
,
$bug
->
delta_ts
]));
require
'process_bug.cgi'
;
...
...
process_bug.cgi
View file @
1cf4971f
...
...
@@ -122,16 +122,14 @@ if ($delta_ts) {
if
(
$first_delta_tz_z
ne
$delta_ts_z
)
{
(
$vars
->
{
'operations'
})
=
$first_bug
->
get_activity
(
undef
,
$delta_ts
);
my
$start_at
=
$cgi
->
param
(
'longdesclength'
)
or
ThrowCodeError
(
'undefined_field'
,
{
field
=>
'longdesclength'
});
# Always sort midair collision comments oldest to newest,
# regardless of the user's personal preference.
my
$comments
=
$first_bug
->
comments
({
order
=>
"oldest_to_newest"
});
my
$comments
=
$first_bug
->
comments
({
order
=>
'oldest_to_newest'
,
after
=>
$delta_ts
});
# Show midair if previous changes made other than CC
# and/or one or more comments were made
my
$do_midair
=
scalar
@$comments
>
$start_at
?
1
:
0
;
my
$do_midair
=
scalar
@$comments
?
1
:
0
;
if
(
!
$do_midair
)
{
foreach
my
$operation
(
@
{
$vars
->
{
'operations'
}
})
{
...
...
@@ -147,7 +145,6 @@ if ($delta_ts) {
if
(
$do_midair
)
{
$vars
->
{
'title_tag'
}
=
"mid_air"
;
$vars
->
{
'start_at'
}
=
$start_at
;
$vars
->
{
'comments'
}
=
$comments
;
$vars
->
{
'bug'
}
=
$first_bug
;
# The token contains the old delta_ts. We need a new one.
...
...
template/en/default/bug/comments.html.tmpl
View file @
1cf4971f
...
...
@@ -44,26 +44,16 @@
//-->
</script>
[% DEFAULT start_at = 0 mode = "show" %]
[% sort_order = user.settings.comment_sort_order.value %]
[% DEFAULT mode = "show" %]
[% user_cache = template_cache.users %]
[%# NOTE: (start_at > 0) means we came here from a midair collision,
# in which case we don't care what the user's preference is.
%]
[% IF (start_at > 0) %]
[% sort_order = "oldest_to_newest" %]
[% END %]
<!-- This auto-sizes the comments and positions the collapse/expand links
to the right. -->
<table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
<td>
[% FOREACH comment = comments %]
[% IF comment.count >= start_at %]
[% PROCESS a_comment %]
[% END %]
[% END %]
[% IF mode == "edit" && user.id
...
...
template/en/default/bug/edit.html.tmpl
View file @
1cf4971f
...
...
@@ -46,7 +46,6 @@
<form name="changeform" id="changeform" method="post" action="process_bug.cgi">
<input type="hidden" name="delta_ts" value="[% bug.delta_ts %]">
<input type="hidden" name="longdesclength" value="[% bug.comments.size %]">
<input type="hidden" name="id" value="[% bug.bug_id %]">
<input type="hidden" name="token" value="[% issue_hash_token([bug.id, bug.delta_ts]) FILTER html %]">
...
...
template/en/default/bug/process/midair.html.tmpl
View file @
1cf4971f
...
...
@@ -11,10 +11,6 @@
# 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.
# start_at: number; the comment at which show/comments.tmpl should begin
# displaying comments, either the index of the last comment (if the user
# 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: Bugzilla::Bug; the bug being changed.
#%]
...
...
@@ -40,7 +36,7 @@
[% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %]
</p>
[% IF comments.size
> start_at
%]
[% IF comments.size %]
<p>
Added the comment(s):
<blockquote>
...
...
@@ -71,7 +67,7 @@ You have the following choices:
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
%].
[% ", except for the added comment(s)" IF comments.size %].
</form>
</li>
[% IF cgi.param("comment") %]
...
...
@@ -82,7 +78,6 @@ You have the following choices:
<input type="hidden" name="comment" value="[% cgi.param("comment") FILTER html %]">
<input type="hidden" name="comment_is_private"
value="[% cgi.param("comment_is_private") FILTER html %]">
<input type="hidden" name="longdesclength" value="[% bug.comments.size %]">
<input type="hidden" name="token" value="[% cgi.param("token") FILTER html %]">
<input type="submit" id="process_comment" value="Submit only my new comment">
</form>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment