From c4d48bbcc731852975f27365d1af7e27e6db5d57 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sat, 3 Mar 2012 16:00:27 +0100 Subject: Bug 731586: Email notifications about status changes in blockers are incorrectly formatted r=dkl a=LpSolit --- template/en/default/email/bugmail.html.tmpl | 6 +++--- template/en/default/email/bugmail.txt.tmpl | 12 ++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'template') diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl index ac4727811..fa3a447d7 100644 --- a/template/en/default/email/bugmail.html.tmpl +++ b/template/en/default/email/bugmail.html.tmpl @@ -59,10 +59,10 @@ [% BLOCK generate_diffs %] [% SET in_table = 0 %] - [% last_changer = "" %] + [% last_changer = 0 %] [% FOREACH change = diffs %] - [% IF !isnew && change.who.login != last_changer %] - [% last_changer = change.who.login %] + [% IF !isnew && changer.id != last_changer %] + [% last_changer = changer.id %] [% IF in_table == 1 %] [% SET in_table = 0 %] diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl index 2d20aff7c..0b349fb15 100644 --- a/template/en/default/email/bugmail.txt.tmpl +++ b/template/en/default/email/bugmail.txt.tmpl @@ -50,21 +50,17 @@ You are receiving this mail because: [% BLOCK generate_diffs %] [% urlbase %]show_bug.cgi?id=[% bug.id %] -[%+ last_changer = "" %] +[%+ last_changer = 0 %] [% FOREACH change = diffs %] - [% IF !isnew && change.who.login != last_changer %] - [% last_changer = change.who.login %] + [% IF !isnew && changer.id != last_changer %] + [% last_changer = changer.id %] [% IF change.blocker %] [% terms.Bug %] [%+ bug.id %] depends on [% terms.bug %] [%+ change.blocker.id %], which changed state. [%+ terms.Bug %] [%+ change.blocker.id %] Summary: [% change.blocker.short_desc %] [%+ urlbase %]show_bug.cgi?id=[% change.blocker.id %] [% ELSE %] - [%~ IF change.who.name %] - [% change.who.name _ " <" _ change.who.login _ ">" %] - [% ELSE %] - [% change.who.login %] - [% END %] changed: + [%~ changer.identity %] changed: [% END %] What |Removed |Added -- cgit v1.2.3-24-g4f1b From 872ad2b238317ff1c81633b25cfb3460886d0029 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Tue, 6 Mar 2012 22:05:20 +0100 Subject: Bug 731323: Wrong URLs in the "Total" row at the bottom of tabular reports when JS is enabled and a user field is used for the vertical axis r=gerv a=LpSolit --- template/en/default/reports/report-table.html.tmpl | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'template') diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl index 561d0517e..d32335ce8 100644 --- a/template/en/default/reports/report-table.html.tmpl +++ b/template/en/default/reports/report-table.html.tmpl @@ -50,6 +50,10 @@ YAHOO.util.Event.addListener(window, "load", function() { this.Linkify = function(elLiner, oRecord, oColumn, oData) { if (oData == 0) elLiner.innerHTML = "."; + else if (oRecord.getData("row_title") == "Total") + elLiner.innerHTML = "" + + oData + ""; else elLiner.innerHTML = "" + + oData + ""; else elLiner.innerHTML = " -- cgit v1.2.3-24-g4f1b From 5a05d970d8ee3a8c18e5b3f96302a97ec45e988e Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Tue, 6 Mar 2012 22:24:54 +0100 Subject: Fix bustage --- template/en/default/filterexceptions.pl | 1 - 1 file changed, 1 deletion(-) (limited to 'template') diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 772efa1b7..8680573fb 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -88,7 +88,6 @@ ], 'reports/report-table.html.tmpl' => [ - '"&$tbl_vals" IF tbl_vals', '"&$col_vals" IF col_vals', '"&$row_vals" IF row_vals', 'classes.$row_idx.$col_idx', -- cgit v1.2.3-24-g4f1b From c3192ab0181f43f6806340da301c12895114769f Mon Sep 17 00:00:00 2001 From: Marc Schumann Date: Sat, 10 Mar 2012 17:07:30 +0100 Subject: Tabular reports' column headers do not use display_value. r/a=LpSolit https://bugzilla.mozilla.org/show_bug.cgi?id=734413 --- template/en/default/reports/report-table.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'template') diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl index 15de4bc90..8a3ab9524 100644 --- a/template/en/default/reports/report-table.html.tmpl +++ b/template/en/default/reports/report-table.html.tmpl @@ -102,7 +102,7 @@ YAHOO.util.Event.addListener(window, "load", function() { var myColumnDefs = [ {key:"row_title", label:"", sortable:true, sortOptions: { sortFunction:totalNumberSorter }}, [% FOREACH col = col_names %] - {key:"[% col FILTER js %]", label:"[% col FILTER js %]", sortable:true, + {key:"[% col FILTER js %]", label:"[% display_value(col_field, col) FILTER js %]", sortable:true, formatter:this.Linkify, sortOptions: { defaultDir: YAHOO.widget.DataTable.CLASS_DESC, sortFunction:totalNumberSorter }}, [% END %] {key:"total", label:"Total", sortable:true, formatter:this.LinkifyTotal, -- cgit v1.2.3-24-g4f1b From 35ac96234299d366dc39c8466e645cd8d59609ab Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sat, 17 Mar 2012 14:03:21 +0100 Subject: Bug 736057: Add to the release notes that |FILTER url_quote| has been replaced by |FILTER uri| r=dkl a=LpSolit --- template/en/default/pages/release-notes.html.tmpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'template') diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index 03df6911c..1447588b5 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -358,6 +358,9 @@
  • YUI has been upgraded to 2.9.0.
  • Due to the major code refactor of B[%%]ugzilla/Search.pm, any customization made against this file will probably need to be rewritten.
    • +
  • The Bugzilla-specific url_quote filter used in templates has been + removed and replaced by the uri filter from Template::Toolkit as + they are now similar.
  • long_list.cgi, showattachment.cgi and xml.cgi have been removed from the codebase. As announced in the release notes of [% terms.Bugzilla %] 4.0, these scripts were deprecated -- cgit v1.2.3-24-g4f1b From 16ca329e85e1a36a4808cc088ebc8f5d18f22dae Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sat, 17 Mar 2012 14:12:05 +0100 Subject: Fix bustage: Bugzilla -> terms.Bugzilla https://bugzilla.mozilla.org/show_bug.cgi?id=736057 --- template/en/default/pages/release-notes.html.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'template') diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index 1447588b5..6402814e1 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -358,9 +358,9 @@
  • YUI has been upgraded to 2.9.0.
  • Due to the major code refactor of B[%%]ugzilla/Search.pm, any customization made against this file will probably need to be rewritten.
    • -
  • The Bugzilla-specific url_quote filter used in templates has been - removed and replaced by the uri filter from Template::Toolkit as - they are now similar.
    • +
  • The [% terms.Bugzilla %]-specific url_quote filter used in templates + has been removed and replaced by the uri filter from Template::Toolkit + as they are now similar.
  • long_list.cgi, showattachment.cgi and xml.cgi have been removed from the codebase. As announced in the release notes of [% terms.Bugzilla %] 4.0, these scripts were deprecated -- cgit v1.2.3-24-g4f1b