summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xBug.pm10
-rwxr-xr-xBugzilla/Bug.pm10
-rw-r--r--bugzilla.dtd4
-rw-r--r--template/en/default/bug/edit.html.tmpl4
4 files changed, 14 insertions, 14 deletions
diff --git a/Bug.pm b/Bug.pm
index 91c20780a..29f2e9b73 100755
--- a/Bug.pm
+++ b/Bug.pm
@@ -143,7 +143,7 @@ sub initBug {
"assigned_to", "reporter", "bug_file_loc", "short_desc",
"target_milestone", "qa_contact", "status_whiteboard",
"creation_ts", "delta_ts", "votes",
- "reporter_accessible", "cclist_accessible".
+ "reporter_accessible", "cclist_accessible",
"estimated_time", "remaining_time")
{
$fields{$field} = shift @row;
@@ -233,9 +233,9 @@ sub initBug {
if (@depends) {
$self->{'dependson'} = \@depends;
}
- my @blocks = EmitDependList("dependson", "blocked", $bug_id);
- if (@blocks) {
- $self->{'blocks'} = \@blocks;
+ my @blocked = EmitDependList("dependson", "blocked", $bug_id);
+ if (@blocked) {
+ $self->{'blocked'} = \@blocked;
}
return $self;
@@ -454,7 +454,7 @@ sub emitXML {
}
}
- foreach my $field ("dependson", "blocks", "cc") {
+ foreach my $field ("dependson", "blocked", "cc") {
if (defined $self->{$field}) {
for (my $i=0 ; $i < @{$self->{$field}} ; $i++) {
$xml .= " <$field>" . $self->{$field}[$i] . "</$field>\n";
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 91c20780a..29f2e9b73 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -143,7 +143,7 @@ sub initBug {
"assigned_to", "reporter", "bug_file_loc", "short_desc",
"target_milestone", "qa_contact", "status_whiteboard",
"creation_ts", "delta_ts", "votes",
- "reporter_accessible", "cclist_accessible".
+ "reporter_accessible", "cclist_accessible",
"estimated_time", "remaining_time")
{
$fields{$field} = shift @row;
@@ -233,9 +233,9 @@ sub initBug {
if (@depends) {
$self->{'dependson'} = \@depends;
}
- my @blocks = EmitDependList("dependson", "blocked", $bug_id);
- if (@blocks) {
- $self->{'blocks'} = \@blocks;
+ my @blocked = EmitDependList("dependson", "blocked", $bug_id);
+ if (@blocked) {
+ $self->{'blocked'} = \@blocked;
}
return $self;
@@ -454,7 +454,7 @@ sub emitXML {
}
}
- foreach my $field ("dependson", "blocks", "cc") {
+ foreach my $field ("dependson", "blocked", "cc") {
if (defined $self->{$field}) {
for (my $i=0 ; $i < @{$self->{$field}} ; $i++) {
$xml .= " <$field>" . $self->{$field}[$i] . "</$field>\n";
diff --git a/bugzilla.dtd b/bugzilla.dtd
index 681a46f9b..0445d0a4e 100644
--- a/bugzilla.dtd
+++ b/bugzilla.dtd
@@ -5,7 +5,7 @@
maintainer CDATA #REQUIRED
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
error (NotFound | NotPermitted | InvalidBugId) #IMPLIED
>
@@ -33,7 +33,7 @@
<!ELEMENT short_desc (#PCDATA)>
<!ELEMENT keywords (#PCDATA)>
<!ELEMENT dependson (#PCDATA)>
-<!ELEMENT blocks (#PCDATA)>
+<!ELEMENT blocked (#PCDATA)>
<!ELEMENT cc (#PCDATA)>
<!ELEMENT long_desc (who, bug_when, thetext)>
<!ELEMENT who (#PCDATA)>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 56483a779..fec8d122e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -185,7 +185,7 @@
[% IF bug.milestoneurl %]
<a href="[% bug.milestoneurl FILTER html %]">
[% END %]
- <u>T</u>arget Milestone</a>:
+ <u>T</u>arget Milestone:
[% "</a>" IF bug.milestoneurl %]
</b>
</td>
@@ -504,7 +504,7 @@
<input type="radio" name="knob" value="reassign">
<a href="bug_status.html#assigned_to">Reassign</a> bug to
<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 != '')) {
document.changeform.knob[[% knum %]].checked=true;
}"