Commit 60b3e7bd authored by James Edwards-Jones's avatar James Edwards-Jones

Improved CSV export copy

parent a5e9ba9a
......@@ -149,7 +149,7 @@ class Projects::IssuesController < Projects::ApplicationController
ExportCsvWorker.perform_async(@current_user.id, @project.id, csv_params)
index_path = namespace_project_issues_path(@project.namespace, @project)
redirect_to(index_path, notice: "CSV export queued")
redirect_to(index_path, notice: "Your CSV export has started. It will be emailed to #{current_user.notification_email} when complete.")
end
def referenced_merge_requests
......
......@@ -55,11 +55,11 @@
%tbody
%tr
%td{ style: "font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#ffffff;text-align:left;padding:18px 25px;border:1px solid #ededed;border-radius:3px;overflow:hidden;font-size:18px;" }
Your .csv export of #{ @issues_count } issues from project
Your CSV export of #{ @issues_count } issues from project
%a{ href: project_url(@project), style: "color:#3777b0;text-decoration:none;" }
= @project.name
has been added to this email as an attachment.
-if @truncated
- if @truncated
%br
%br
This attachment has been truncated due to exceeding the maximum attachment size. Consider re-exporting with a narrower selection of issues.
......
Your .csv export of <%= @issues_count %> issues from project <%= @project.name %> ( <%= project_url(@project) %> ) has been added to this email as an attachment.
Your CSV export of <%= @issues_count %> issues from project <%= @project.name %> ( <%= project_url(@project) %> ) has been added to this email as an attachment.
<% if @truncated %>
This attachment has been truncated due to exceeding the maximum attachment size. Consider re-exporting with a narrower selection of issues.
......
......@@ -6,7 +6,7 @@
.export-svg-container.pull-right
= render 'projects/issues/export_issues/export_issues_list.svg'
%h3
Export issues list
Export issues
.modal-header
= icon('check', { class: 'export-checkmark' })
%strong
......
......@@ -23,7 +23,7 @@
= link_to params.merge(rss_url_options), class: 'btn append-right-10 has-tooltip', title: 'Subscribe' do
= icon('rss')
- if current_user
%button.csv_download_link.btn.append-right-10.has-tooltip{ title: 'Download CSV' }
%button.csv_download_link.btn.append-right-10.has-tooltip{ title: 'Export as CSV' }
= icon('download')
- if can? current_user, :create_issue, @project
= link_to new_namespace_project_issue_path(@project.namespace,
......
......@@ -39,7 +39,8 @@ describe 'Issues csv', feature: true do
it 'displays flash message' do
request_csv
expect(page).to have_content 'CSV export queued'
expect(page).to have_content 'CSV export has started'
expect(page).to have_content "emailed to #{user.notification_email}"
end
it 'includes a csv attachment' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment