diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2013-10-11 23:44:25 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-10-11 23:44:25 +0200 |
| commit | 0e52c06f2069cb5413abce39d6249bac73f045c8 (patch) | |
| tree | 326576b9e20d428c8ddad006d29dd0bdd2b3f75d /extensions/BMO/template | |
| parent | 085a562c412b8bcdedf978821222f3b6585993e5 (diff) | |
| download | bugzilla-0e52c06f2069cb5413abce39d6249bac73f045c8.tar.gz bugzilla-0e52c06f2069cb5413abce39d6249bac73f045c8.tar.xz | |
Bug 880829 - Migrate current custom field based tracking flags to the new Tracking Flags extension tables
r=glob
Diffstat (limited to 'extensions/BMO/template')
| -rw-r--r-- | extensions/BMO/template/en/default/email/bugmail.html.tmpl | 12 | ||||
| -rw-r--r-- | extensions/BMO/template/en/default/email/bugmail.txt.tmpl | 15 |
2 files changed, 7 insertions, 20 deletions
diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl index e84852289..7daec3b2e 100644 --- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl +++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl @@ -76,20 +76,14 @@ Product/Component: [% bug.product FILTER html %] :: [% bug.component FILTER html %] </div> -[% USE Bugzilla %] -[% tracking_flags = [] %] -[% FOREACH field = Bugzilla.active_custom_fields(product => bug.product_obj, component => bug.component_obj, type => 2) %] - [% NEXT IF cf_flag_disabled(field.name, bug) %] - [% NEXT IF bug.${field.name} == "---" %] - [% tracking_flags.push(field) %] -[% END %] [% IF tracking_flags.size %] <div id="tracking" style="font-size: 90%; color: #666666"> <hr style="border: 1px dashed #969696"> <b>Tracking Flags:</b> <ul> - [% FOREACH field = tracking_flags %] - <li>[% field.description FILTER html %]:[% bug.${field.name} FILTER html %]</li> + [% FOREACH flag = tracking_flags %] + [% NEXT IF bug.${flag.name} == "---" %] + <li>[% flag.description FILTER html %]:[% bug.${flag.name} FILTER html %]</li> [% END %] </ul> </div> diff --git a/extensions/BMO/template/en/default/email/bugmail.txt.tmpl b/extensions/BMO/template/en/default/email/bugmail.txt.tmpl index 771157dd1..ed74ad880 100644 --- a/extensions/BMO/template/en/default/email/bugmail.txt.tmpl +++ b/extensions/BMO/template/en/default/email/bugmail.txt.tmpl @@ -39,18 +39,11 @@ Configure [% terms.bug %]mail: [% urlbase %]userprefs.cgi?tab=email ------------------------------- Product/Component: [%+ bug.product +%] :: [%+ bug.component %] -[% USE Bugzilla %] -[% show_tracking_flags = [] %] -[% FOREACH field = Bugzilla.active_custom_fields(product => bug.product_obj, component => bug.component_obj, type => 2) %] - [% NEXT IF cf_flag_disabled(field.name, bug) %] - [% NEXT IF bug.${field.name} == "---" %] - [% show_tracking_flags.push(field) %] -[% END %] - -[% IF show_tracking_flags.size %] +[% IF tracking_flags.size %] ------- Tracking Flags: ------- -[% FOREACH field = show_tracking_flags %] -[%+ field.description %]:[% bug.${field.name} %] +[% FOREACH flag = tracking_flags %] + [% NEXT IF bug.${flag.name} == "---" %] +[%+ flag.description %]:[% bug.${flag.name} %] [% END %] [% END %] |