diff options
| author | Michael J Tosh <michael.j.tosh@lmco.com> | 2011-02-14 20:50:25 +0100 |
|---|---|---|
| committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2011-02-14 20:50:25 +0100 |
| commit | bfe719017240bceaf7c686baf4d30f9dcc35b943 (patch) | |
| tree | 57d17271501b22d1a6ee0631a5f0bcb2083090f6 | |
| parent | 739d3a205aa7e3da1525eb8cce2ee7ef46317702 (diff) | |
| download | bugzilla-bfe719017240bceaf7c686baf4d30f9dcc35b943.tar.gz bugzilla-bfe719017240bceaf7c686baf4d30f9dcc35b943.tar.xz | |
Bug 417551: Make it possible for CSV headers to be the field description
instead of the field name, and have the buglist.cgi link give you CSV like
this by default.
r=mkanat, a=mkanat
| -rwxr-xr-x | buglist.cgi | 4 | ||||
| -rw-r--r-- | template/en/default/list/list.csv.tmpl | 14 | ||||
| -rw-r--r-- | template/en/default/list/list.html.tmpl | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/buglist.cgi b/buglist.cgi index 4b7fe8f5a..64681b2cd 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -1130,6 +1130,10 @@ if ($format->{'extension'} eq "csv") { # We set CSV files to be downloaded, as they are designed for importing # into other programs. $disposition = "attachment"; + + # If the user clicked the CSV link in the search results, + # They should get the Field Description, not the column name in the db + $vars->{'human'} = $cgi->param('human'); } # Suggest a name for the bug list if the user wants to save it as a file. diff --git a/template/en/default/list/list.csv.tmpl b/template/en/default/list/list.csv.tmpl index 6114d6fae..be0a5bc69 100644 --- a/template/en/default/list/list.csv.tmpl +++ b/template/en/default/list/list.csv.tmpl @@ -17,15 +17,23 @@ # # Contributor(s): Myk Melez <myk@mozilla.org> # Gervase Markham <gerv@gerv.net> + # miketosh #%] [% PROCESS "global/field-descs.none.tmpl" %] [% colsepchar = user.settings.csv_colsepchar.value %] -bug_id -[% FOREACH column = displaycolumns %] - [% colsepchar %][% column FILTER csv %] +[% IF human %] + [% field_descs.bug_id FILTER csv %] + [% FOREACH column = displaycolumns %] + [% colsepchar %][% field_descs.$column FILTER csv %] + [% END %] +[% ELSE %] + bug_id + [% FOREACH column = displaycolumns %] + [% colsepchar %][% column FILTER csv %] + [% END %] [% END %] [% FOREACH bug = bugs %] diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index 924ce23dc..a669aecb9 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -204,7 +204,7 @@ <td valign="middle" class="bz_query_links"> <a href="buglist.cgi? - [% urlquerypart FILTER html %]&ctype=csv">CSV</a> | + [% urlquerypart FILTER html %]&ctype=csv&human=1">CSV</a> | <a href="buglist.cgi? [% urlquerypart FILTER html %]&title= [%- title FILTER html %]&ctype=atom">Feed</a> | |