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.

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

Add control that id is not nil otherwise set it to new #811

Merged
merged 3 commits into from
Apr 17, 2017

Conversation

ZitaNemeckova
Copy link
Contributor

@ZitaNemeckova ZitaNemeckova commented Mar 27, 2017

Introduced by #379 . So @miq-bot add_label euwe/yes, darga/yes, bug, trees

https://bugzilla.redhat.com/show_bug.cgi?id=1434857

Configuration -> Access Control -> Group -> Configuration -> Add new Group -> select anything from trees

Before:
screen shot 2017-03-27 at 5 13 10 pm

After:
screen shot 2017-03-27 at 5 14 41 pm

@chessbyte chessbyte changed the title Add controll that id is not nil otherwise set it to new Add control that id is not nil otherwise set it to new Mar 27, 2017
@h-kataria
Copy link
Contributor

@ZitaNemeckova can you add a spec test to verify this fix.

@ZitaNemeckova ZitaNemeckova changed the title Add control that id is not nil otherwise set it to new [WIP] Add control that id is not nil otherwise set it to new Mar 28, 2017
@miq-bot miq-bot added the wip label Mar 28, 2017
@miq-bot
Copy link
Member

miq-bot commented Mar 30, 2017

This pull request is not mergeable. Please rebase and repush.

@miq-bot
Copy link
Member

miq-bot commented Apr 10, 2017

Checked commits ZitaNemeckova/manageiq-ui-classic@e6f2824~...4331d85 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
5 files checked, 1 offense detected

app/presenters/tree_builder.rb

@ZitaNemeckova
Copy link
Contributor Author

@miq-bot remove_label wip
@h-kataria please review. Thanks :)

@miq-bot miq-bot changed the title [WIP] Add control that id is not nil otherwise set it to new Add control that id is not nil otherwise set it to new Apr 11, 2017
@miq-bot miq-bot removed the wip label Apr 11, 2017
@dclarizio
Copy link

@ZitaNemeckova the BZ is marked as 5.8, shouldn't this only be labeled as fine/yes, but not for the other releases?

@chrispy1
Copy link

@miq-bot add_label fine/yes

@h-kataria
Copy link
Contributor

looks good.

@h-kataria h-kataria added this to the Sprint 59 Ending Apr 24, 2017 milestone Apr 17, 2017
@h-kataria h-kataria merged commit 1895ce6 into ManageIQ:master Apr 17, 2017
simaishi pushed a commit that referenced this pull request Apr 18, 2017
Add control that id is not nil otherwise set it to new
(cherry picked from commit 1895ce6)

https://bugzilla.redhat.com/show_bug.cgi?id=1442891
@simaishi
Copy link
Contributor

Fine backport details:

$ git log -1
commit 971471429d5ced8b84fd9010489ef6474756daeb
Author: Harpreet Kataria <hkataria@redhat.com>
Date:   Mon Apr 17 17:15:59 2017 -0400

    Merge pull request #811 from ZitaNemeckova/bz1434857
    
    Add control that id is not nil otherwise set it to new
    (cherry picked from commit 1895ce6a49144235dbc4458a0639df6d97912d66)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1442891

@simaishi
Copy link
Contributor

@ZitaNemeckova TreeBuilder refactoring is causing conflict backporting to euwe branch... Please resolve conflict and create an Euwe-specific PR (referencing this one) or suggest other PRs to backport.

Euwe backport conflict:

$ git status
On branch euwe
Your branch is up-to-date with 'origin/euwe'.
You are currently cherry-picking commit 1895ce6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   app/presenters/tree_builder.rb
	modified:   spec/presenters/tree_builder_tags_spec.rb

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by us:   app/presenters/tree_builder_belongs_to_hac.rb
	both modified:   app/presenters/tree_builder_tags.rb
	deleted by us:   spec/presenters/tree_builder_belongs_to_hac_spec.rb

@ZitaNemeckova
Copy link
Contributor Author

@simaishi Euwe version: ManageIQ/manageiq#15098

@simaishi
Copy link
Contributor

Backported to Euwe via ManageIQ/manageiq#15098

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants