mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-24 20:36:49 +00:00
Simplify report rendering
* DRY rendering_options calls. * Remove unneeded parameter from method. * Choose better name for background rendering method.
This commit is contained in:
@@ -21,11 +21,10 @@ module Admin
|
||||
|
||||
def show
|
||||
@report = report_class.new(spree_current_user, params, render: render_data?)
|
||||
@rendering_options = rendering_options # also stores user preferences
|
||||
|
||||
if render_data?
|
||||
rendering_options # stores user preferences
|
||||
|
||||
background(report_format)
|
||||
render_in_background
|
||||
else
|
||||
show_report
|
||||
end
|
||||
@@ -43,7 +42,6 @@ module Admin
|
||||
@report_subtypes = report_subtypes
|
||||
@report_subtype = report_subtype
|
||||
@report_title = report_title
|
||||
@rendering_options = rendering_options
|
||||
@data = Reporting::FrontendData.new(spree_current_user)
|
||||
|
||||
variant_id_in = params[:variant_id_in]&.compact_blank
|
||||
@@ -60,7 +58,7 @@ module Admin
|
||||
request.post?
|
||||
end
|
||||
|
||||
def background(format)
|
||||
def render_in_background
|
||||
cable_ready[ScopedChannel.for_id(params[:uuid])]
|
||||
.inner_html(
|
||||
selector: "#report-table",
|
||||
@@ -72,7 +70,8 @@ module Admin
|
||||
|
||||
ReportJob.perform_later(
|
||||
report_class:, user: spree_current_user, params:,
|
||||
format:, filename: report_filename,
|
||||
format: report_format,
|
||||
filename: report_filename,
|
||||
channel: ScopedChannel.for_id(params[:uuid]),
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user