summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-07-16 10:43:21 +0200
committerByron Jones <glob@mozilla.com>2014-07-16 10:43:21 +0200
commit27f407210c296818fc99650715a9980b4bfe5420 (patch)
tree62f6cdfaae57090a7a546f5bd59db9d239516ad9
parent948d1f3d201653081fa5491edf6679e78796c3e7 (diff)
downloadbugzilla-27f407210c296818fc99650715a9980b4bfe5420.tar.gz
bugzilla-27f407210c296818fc99650715a9980b4bfe5420.tar.xz
Bug 1039198: Field name is still "Bug #" for the Bug Created field
-rw-r--r--extensions/BugmailFilter/Extension.pm3
-rw-r--r--extensions/BugmailFilter/template/en/default/account/prefs/bugmail_filter.html.tmpl4
2 files changed, 4 insertions, 3 deletions
diff --git a/extensions/BugmailFilter/Extension.pm b/extensions/BugmailFilter/Extension.pm
index 60c180ca7..01719db1f 100644
--- a/extensions/BugmailFilter/Extension.pm
+++ b/extensions/BugmailFilter/Extension.pm
@@ -140,7 +140,8 @@ sub user_preferences {
$fields{$field->name} = $field->description;
}
- $vars->{fields} = [
+ $vars->{fields} = \%fields;
+ $vars->{field_list} = [
sort { lc($a->{description}) cmp lc($b->{description}) }
map { { name => $_, description => $fields{$_} } }
keys %fields
diff --git a/extensions/BugmailFilter/template/en/default/account/prefs/bugmail_filter.html.tmpl b/extensions/BugmailFilter/template/en/default/account/prefs/bugmail_filter.html.tmpl
index 1bcbd35ae..6d59e52b1 100644
--- a/extensions/BugmailFilter/template/en/default/account/prefs/bugmail_filter.html.tmpl
+++ b/extensions/BugmailFilter/template/en/default/account/prefs/bugmail_filter.html.tmpl
@@ -43,7 +43,7 @@ var cpts = new Array();
<td>
<select name="field" id="field">
<option value="">__Any__</option>
- [% FOREACH field = fields %]
+ [% FOREACH field = field_list %]
<option value="[% field.name FILTER html %]">
[% field.description FILTER html %]
</option>
@@ -143,7 +143,7 @@ var cpts = new Array();
</td>
<td>[% filter.product ? filter.product.name : 'Any' FILTER html %]</td>
<td>[% filter.component ? filter.component.name : 'Any' FILTER html %]</td>
- <td>[% filter.field ? filter.field.description : 'Any' FILTER html %]</td>
+ <td>[% filter.field ? fields.${filter.field.name} : 'Any' FILTER html %]</td>
<td>[% filter.relationship ? filter.relationship_name : 'Any' FILTER html %]</td>
<td>[% filter.action ? 'Exclude' : 'Include' %]</td>
</tr>