Added "Preserve owner?" checkbox on Import report screen #5060
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yrudman
added a commit
to yrudman/manageiq
that referenced
this pull request
Dec 7, 2018
…port. There is 'Preserve owner' checkbox added on Import report page, UI PR: ManageIQ/manageiq-ui-classic#5060 This checkbox controls if report will be imported in the old way: unconditionally override user_id and miq_group_id fields of imported report, OR in the new way: keep those fields untouched. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1638533
yrudman
changed the title
app/controllers/report_controller.rb
Outdated
| @@ -72,8 +72,11 @@ def upload | |||
| end | |||
| if params[:upload] && params[:upload][:file] && params[:upload][:file].respond_to?(:read) | |||
| @sb[:overwrite] = !params[:overwrite].nil? | |||
| @sb[:preserve_owner] = !params[:preserve_owner].nil? | |||
There was a problem hiding this comment.
@sb[:preserve_owner] = params[:preserve_owner].present? sounds better :)
There was a problem hiding this comment.
ok, I will change
it would look more easy to read, but will dissonance with the line above it...
There was a problem hiding this comment.
I'll take care of that in #5094 :)
There was a problem hiding this comment.
@ZitaNemeckova Ohh, I see, you have change that in PR
| @@ -13,10 +13,14 @@ | |||
| :multipart => true, | |||
| :method => :post) do | |||
| - overwrite = @sb[:overwrite] ? true : false | |||
| - preserve_owner = @sb[:preserve_owner] ? true : false | |||
There was a problem hiding this comment.
This seems to be extra. Why not use @sb[:preserve_owner] directly?
|
LGTM 👍 |
ZitaNemeckova
approved these changes
Dec 17, 2018
|
This pull request is not mergeable. Please rebase and repush. |
…ser_id and miq_group_id field of imported report with value for user who is doing import. After: owrk old way (ovverride) f Preserver Owner checkbox unchecked and do not override (keep original values) if this checkbox checked. After: owrk old way (ovverride) f Preserver Owner checkbox unchecked and do not override (keep original values) if this checkbox checked. Depends on ManageIQ/manageiq#18270 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1638533
yrudman
force-pushed
the
added-preserve-owner-checkbox
branch
from
062d75f to
57fde20
Compare
yrudman
force-pushed
the
added-preserve-owner-checkbox
branch
from
57fde20 to
acd3826
Compare
|
Checked commits yrudman/manageiq-ui-classic@7a2e79f~...acd3826 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
yrudman
added a commit
to yrudman/manageiq
that referenced
this pull request
Dec 20, 2018
…port. There is 'Preserve owner' checkbox added on Import report page, UI PR: ManageIQ/manageiq-ui-classic#5060 This checkbox controls if report will be imported in the old way: unconditionally override user_id and miq_group_id fields of imported report, OR in the new way: keep those fields untouched. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1638533
|
Travis was green but not shown here. Restarted. |
|
Good to merge once the core PR is merged. 👍 |
yrudman
added a commit
to yrudman/manageiq
that referenced
this pull request
Jan 9, 2019
There is 'Preserve owner' checkbox added on Import report page, UI PR: ManageIQ/manageiq-ui-classic#5060 This checkbox controls if report will be imported in the old way: unconditionally override user_id and miq_group_id fields of imported report, OR in the new way: keep those fields untouched. In order to support report import in mutilregion environment: added 'userid' and 'group_description' attributes to exported report Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1638533
yrudman
added a commit
to yrudman/manageiq
that referenced
this pull request
Jan 9, 2019
There is 'Preserve owner' checkbox added on Import report page, UI PR: ManageIQ/manageiq-ui-classic#5060 This checkbox controls if report will be imported in the old way: unconditionally override user_id and miq_group_id fields of imported report, OR in the new way: keep those fields untouched. In order to support report import in mutilregion environment: added 'userid' and 'group_description' attributes to exported report Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1638533
yrudman
added a commit
to yrudman/manageiq
that referenced
this pull request
Jan 11, 2019
There is 'Preserve owner' checkbox added on Import report page, UI PR: ManageIQ/manageiq-ui-classic#5060 This checkbox controls if report will be imported in the old way: unconditionally override user_id and miq_group_id fields of imported report, OR in the new way: keep those fields untouched. In order to support report import in mutilregion environment: added 'userid' and 'group_description' attributes to exported report Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1638533
|
@miq-bot remove-label pending core @martinpovolny core PR merged |
simaishi
pushed a commit
that referenced
this pull request
Mar 29, 2019
Added "Preserve owner?" checkbox on Import report screen (cherry picked from commit 738d133) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1693719
|
Hammer backport details: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before:
We unconditionally overrided
user_idandmiq_group_idfields of imported report with value for user who is doing import.After:
Preserver owner?checkbox is controlling if we need to work in old way (override) or preserveuser_idandmiq_group_idfrom imported reportDepends on ManageIQ/manageiq#18270
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1638533
@miq-bot add-label enhancement , cloud intel/reporting, pending core
\cc @gtanzillo