Skip to content

bugzilla
bugzilla
Commit 179d6c8d authored by bbaetz%student.usyd.edu.au's avatar bbaetz%student.usyd.edu.au
Browse files
Options

Bug 182946 - fix regressions from bug 171493

(Bug.pm/show_bug.cgi/bug_form.pl reorg) r,a=justdave
parent 26b0bc8a
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
Bug.pm
View file @ 179d6c8d
...@@ -143,7 +143,7 @@ sub initBug { ...@@ -143,7 +143,7 @@ sub initBug {
"assigned_to", "reporter", "bug_file_loc", "short_desc", "assigned_to", "reporter", "bug_file_loc", "short_desc",
"target_milestone", "qa_contact", "status_whiteboard", "target_milestone", "qa_contact", "status_whiteboard",
"creation_ts", "delta_ts", "votes", "creation_ts", "delta_ts", "votes",
"reporter_accessible", "cclist_accessible". "reporter_accessible", "cclist_accessible",
"estimated_time", "remaining_time") "estimated_time", "remaining_time")
{ {
$fields{$field} = shift @row; $fields{$field} = shift @row;
...@@ -233,9 +233,9 @@ sub initBug { ...@@ -233,9 +233,9 @@ sub initBug {
if (@depends) { if (@depends) {
$self->{'dependson'} = \@depends; $self->{'dependson'} = \@depends;
} }
my @blocks = EmitDependList("dependson", "blocked", $bug_id); my @blocked = EmitDependList("dependson", "blocked", $bug_id);
if (@blocks) { if (@blocked) {
$self->{'blocks'} = \@blocks; $self->{'blocked'} = \@blocked;
} }
return $self; return $self;
...@@ -454,7 +454,7 @@ sub emitXML { ...@@ -454,7 +454,7 @@ sub emitXML {
} }
} }
foreach my $field ("dependson", "blocks", "cc") { foreach my $field ("dependson", "blocked", "cc") {
if (defined $self->{$field}) { if (defined $self->{$field}) {
for (my $i=0 ; $i < @{$self->{$field}} ; $i++) { for (my $i=0 ; $i < @{$self->{$field}} ; $i++) {
$xml .= " <$field>" . $self->{$field}[$i] . "</$field>\n"; $xml .= " <$field>" . $self->{$field}[$i] . "</$field>\n";
......
Bugzilla/Bug.pm
View file @ 179d6c8d
...@@ -143,7 +143,7 @@ sub initBug { ...@@ -143,7 +143,7 @@ sub initBug {
"assigned_to", "reporter", "bug_file_loc", "short_desc", "assigned_to", "reporter", "bug_file_loc", "short_desc",
"target_milestone", "qa_contact", "status_whiteboard", "target_milestone", "qa_contact", "status_whiteboard",
"creation_ts", "delta_ts", "votes", "creation_ts", "delta_ts", "votes",
"reporter_accessible", "cclist_accessible". "reporter_accessible", "cclist_accessible",
"estimated_time", "remaining_time") "estimated_time", "remaining_time")
{ {
$fields{$field} = shift @row; $fields{$field} = shift @row;
...@@ -233,9 +233,9 @@ sub initBug { ...@@ -233,9 +233,9 @@ sub initBug {
if (@depends) { if (@depends) {
$self->{'dependson'} = \@depends; $self->{'dependson'} = \@depends;
} }
my @blocks = EmitDependList("dependson", "blocked", $bug_id); my @blocked = EmitDependList("dependson", "blocked", $bug_id);
if (@blocks) { if (@blocked) {
$self->{'blocks'} = \@blocks; $self->{'blocked'} = \@blocked;
} }
return $self; return $self;
...@@ -454,7 +454,7 @@ sub emitXML { ...@@ -454,7 +454,7 @@ sub emitXML {
} }
} }
foreach my $field ("dependson", "blocks", "cc") { foreach my $field ("dependson", "blocked", "cc") {
if (defined $self->{$field}) { if (defined $self->{$field}) {
for (my $i=0 ; $i < @{$self->{$field}} ; $i++) { for (my $i=0 ; $i < @{$self->{$field}} ; $i++) {
$xml .= " <$field>" . $self->{$field}[$i] . "</$field>\n"; $xml .= " <$field>" . $self->{$field}[$i] . "</$field>\n";
......
bugzilla.dtd
View file @ 179d6c8d
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
maintainer CDATA #REQUIRED maintainer CDATA #REQUIRED
exporter CDATA #IMPLIED exporter CDATA #IMPLIED
> >
<!ELEMENT bug (bug_id, (alias?, bug_status, product, priority, version, rep_platform, assigned_to, delta_ts, component, reporter, target_milestone?, bug_severity, creation_ts, qa_contact?, op_sys, resolution?, bug_file_loc?, short_desc?, keywords*, status_whiteboard?, dependson*, blocks*, cc*, long_desc*, attachment*)?)> <!ELEMENT bug (bug_id, (alias?, bug_status, product, priority, version, rep_platform, assigned_to, delta_ts, component, reporter, target_milestone?, bug_severity, creation_ts, qa_contact?, op_sys, resolution?, bug_file_loc?, short_desc?, keywords*, status_whiteboard?, dependson*, blocked*, cc*, long_desc*, attachment*)?)>
<!ATTLIST bug <!ATTLIST bug
error (NotFound | NotPermitted | InvalidBugId) #IMPLIED error (NotFound | NotPermitted | InvalidBugId) #IMPLIED
> >
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<!ELEMENT short_desc (#PCDATA)> <!ELEMENT short_desc (#PCDATA)>
<!ELEMENT keywords (#PCDATA)> <!ELEMENT keywords (#PCDATA)>
<!ELEMENT dependson (#PCDATA)> <!ELEMENT dependson (#PCDATA)>
<!ELEMENT blocks (#PCDATA)> <!ELEMENT blocked (#PCDATA)>
<!ELEMENT cc (#PCDATA)> <!ELEMENT cc (#PCDATA)>
<!ELEMENT long_desc (who, bug_when, thetext)> <!ELEMENT long_desc (who, bug_when, thetext)>
<!ELEMENT who (#PCDATA)> <!ELEMENT who (#PCDATA)>
......
template/en/default/bug/edit.html.tmpl
View file @ 179d6c8d
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
[% IF bug.milestoneurl %] [% IF bug.milestoneurl %]
<a href="[% bug.milestoneurl FILTER html %]"> <a href="[% bug.milestoneurl FILTER html %]">
[% END %] [% END %]
<u>T</u>arget Milestone</a>: <u>T</u>arget Milestone:
[% "</a>" IF bug.milestoneurl %] [% "</a>" IF bug.milestoneurl %]
</b> </b>
</td> </td>
...@@ -504,7 +504,7 @@ ...@@ -504,7 +504,7 @@
<input type="radio" name="knob" value="reassign"> <input type="radio" name="knob" value="reassign">
<a href="bug_status.html#assigned_to">Reassign</a> bug to <a href="bug_status.html#assigned_to">Reassign</a> bug to
<input name="assigned_to" size="32" <input name="assigned_to" size="32"
onchange="if ((this.value != '[% bug.assigned_to_email FILTER js %]') && onchange="if ((this.value != '[% bug.assigned_to.email FILTER js %]') &&
(this.value != '')) { (this.value != '')) {
document.changeform.knob[[% knum %]].checked=true; document.changeform.knob[[% knum %]].checked=true;
}" }"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment