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

Added "Preserve owner?" checkbox on Import report screen #5060

Merged
merged 2 commits into from
Jan 16, 2019
Merged

Added "Preserve owner?" checkbox on Import report screen #5060

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
7a2e79f
added Preserve owner? checkbox.Before: we unconditionally overrided u…
yrudman Dec 6, 2018
acd3826
simplify
yrudman Dec 17, 2018
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
5 changes: 4 additions & 1 deletion app/controllers/report_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@ def upload
end
if params[:upload] && params[:upload][:file] && params[:upload][:file].respond_to?(:read)
@sb[:overwrite] = params[:overwrite].present?
@sb[:preserve_owner] = params[:preserve_owner].present?
begin
_reps, mri = MiqReport.import(params[:upload][:file], :save => true, :overwrite => @sb[:overwrite], :userid => session[:userid])
_reps, mri = MiqReport.import(params[:upload][:file], :save => true, :overwrite => @sb[:overwrite],
:userid => session[:userid],
:preserve_owner => @sb[:preserve_owner])
rescue => bang
add_flash(_("Error during 'upload': %{message}") % {:message => bang.message}, :error)
@sb[:flash_msg] = @flash_array
Expand Down
3 changes: 3 additions & 0 deletions app/views/report/_export_custom_reports.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
.col-md-8
= check_box_tag("overwrite", "1", @sb[:overwrite])
= _('Overwrite existing reports?')
.col-md-8
= check_box_tag("preserve_owner", "1", @sb[:preserve_owner])
= _('Preserve owner?')
.form-group
.col-md-4
= render :partial => "shared/file_chooser", :locals => {:object_name => "upload", :method => "file"}
Expand Down