diff --git a/app/views/reports/_summary.html.erb b/app/views/reports/_summary.html.erb index 866d5ec..a40466a 100644 --- a/app/views/reports/_summary.html.erb +++ b/app/views/reports/_summary.html.erb @@ -22,9 +22,9 @@ conditions = {} - <%= render :partial => 'activity_warning' %> - <%= render :partial => 'state_counts' %> - <%= render :partial => 'state_totals' %> - <%= render :partial => 'state_maps' %> + <%= render :partial => 'reports/activity_warning.html' %> + <%= render :partial => 'reports/state_counts.html' %> + <%= render :partial => 'reports/state_totals.html' %> + <%= render :partial => 'reports/state_maps.html' %> diff --git a/app/views/reports/show.html.erb b/app/views/reports/show.html.erb index 94c8b1a..89644ae 100644 --- a/app/views/reports/show.html.erb +++ b/app/views/reports/show.html.erb @@ -2,15 +2,15 @@
<%= - link_to_unless(@summary_report, "Download CSV", download_report_path(@report, :format => :csv)) do |name| - link_to name, download_report_path(@report, {:summary_report_id => @summary_report.id, :format => :csv}) + link_to_unless(params[:activity_search], "Download CSV", download_report_path(@report, :format => :csv)) do |name| + link_to name, download_report_path(@report, {:activity_search => params[:activity_search], :format => :csv}) end %> <%= - link_to_unless @summary_report, "Download PDF", download_report_path(@report, :format => :pdf) do |name| - link_to name, download_report_path(@report, {:summary_report_id => @summary_report.id, :format => :pdf}) + link_to_unless(params[:activity_search], "Download PDF", download_report_path(@report, :format => :pdf)) do |name| + link_to name, download_report_path(@report, {:activity_search => params[:activity_search], :format => :pdf}) end %> diff --git a/app/views/shared/_pdf_output.erb b/app/views/shared/_pdf_output.erb index c3b1967..8d34796 100644 --- a/app/views/shared/_pdf_output.erb +++ b/app/views/shared/_pdf_output.erb @@ -1,2 +1,2 @@ -<%= render :partial => "summary_reports/preview.html.erb" if @summary_report %> +<%= render :partial => "reports/summary.html.erb" if @summary_report %> <%= render :partial => "reports/preview.html.erb" %> \ No newline at end of file