Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Fix widget maximize operation by checking other condition in addition to linked MiqGroup #2069

Closed
wants to merge 2 commits into from
Closed

[WIP] Fix widget maximize operation by checking other condition in addition to linked MiqGroup #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5d8e1c
no need to check if user has access rights to ReportResult if ReportR…
yrudman Aug 31, 2017
6c1d97f
There could be cases when generated report does not have linked group…
yrudman Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ def render_chart
rpt.generate_table(:userid => session[:userid])
else
rpt = if session[:report_result_id]
MiqReportResult.for_user(current_user).find(session[:report_result_id]).report_results
MiqReportResult.find(session[:report_result_id]).report_results
elsif session[:rpt_task_id].present?
MiqTask.find(session[:rpt_task_id]).task_results
else
Expand Down Expand Up @@ -578,7 +578,12 @@ def report_only
end
# Dashboard widget will send in report result id else, find report result in the sandbox
search_id = params[:rr_id] ? params[:rr_id].to_i : @sb[:pages][:rr_id]
rr = MiqReportResult.for_user(current_user).find(search_id)
rr = MiqReportResult.find(search_id)
unless rr.available_to_user?(current_user)
add_flash(_("Current user does not permission to view report data id: #{search_id}"), :error)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yrudman typo missing "have" in the flash message

render :partial => "layouts/flash_msg"
return
end

session[:report_result_id] = rr.id # Save report result id for chart rendering
session[:rpt_task_id] = nil # Clear out report task id, using a saved report
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/application_controller/report_downloads.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def render_pdf(report = nil)
# Use rr frorm paging, if present
rr ||= MiqReportResult.for_user(current_user).find(@sb[:pages][:rr_id]) if @sb[:pages]
# Use report_result_id in session, if present
rr ||= MiqReportResult.for_user(current_user).find(session[:report_result_id]) if session[:report_result_id]
rr ||= MiqReportResult.find(session[:report_result_id]) if session[:report_result_id]

filename = filename_timestamp(rr.report.title)
disable_client_cache
Expand All @@ -51,7 +51,7 @@ def render_report_data
unless params[:task_id] # First time thru, kick off the report generate task
if render_type
@sb[:render_type] = render_type
rr = MiqReportResult.for_user(current_user).find(session[:report_result_id]) # Get report task id from the session
rr = MiqReportResult.find(session[:report_result_id]) # Get report task id from the session
task_id = rr.async_generate_result(@sb[:render_type], :userid => session[:userid],
:session_id => request.session_options[:id])
initiate_wait_for_task(:task_id => task_id)
Expand Down Expand Up @@ -134,7 +134,7 @@ def report_for_rendering
miq_task = MiqTask.find(session[:rpt_task_id])
miq_task.task_results
elsif session[:report_result_id]
rr = MiqReportResult.for_user(current_user).find(session[:report_result_id])
rr = MiqReportResult.find(session[:report_result_id])
report = rr.report_results
report.report_run_time = rr.last_run_on
report
Expand Down