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

[EUWE] Cloud Network UI: Task queue, validation, buttons and translation #13416

Merged
merged 1 commit into from
Jan 13, 2017

Conversation

tzumainn
Copy link
Contributor

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

This is an Euwe-only PR to resolve conflicts with:

app/controllers/cloud_network_controller.rb
app/models/manageiq/providers/openstack/network_manager.rb

This PR is equivalent to #12071
on master.

@tzumainn
Copy link
Contributor Author

@miq-bot add_label bug
@miq-bot add_label blocker

@miq-bot
Copy link
Member

miq-bot commented Jan 10, 2017

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

javascript_redirect previous_breadcrumb_url
def update_finished
task_id = session[:async][:params][:task_id]
cloud_network_id = session[:async][:params][:id]
Copy link
Contributor

Choose a reason for hiding this comment

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

This line can be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@gildub I'd prefer to leave it in, as it was removed upstream in a separate PR; I don't want to introduce potential future merge conflicts. Let me know what you think!

Copy link
Contributor

Choose a reason for hiding this comment

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

@tzumainn, you're right, let's leave it then.

@gildub
Copy link
Contributor

gildub commented Jan 11, 2017

@miq-bot add_label euwe/yes

@tzumainn tzumainn force-pushed the euwe-backport-network-task branch from 3eb6023 to 05e1d05 Compare January 12, 2017 02:55
https://bugzilla.redhat.com/show_bug.cgi?id=1394281

This is an Euwe-only PR to resolve conflicts with:

	app/controllers/cloud_network_controller.rb
	app/models/manageiq/providers/openstack/network_manager.rb

This PR is equivalent to ManageIQ#12071
on master.
@tzumainn tzumainn force-pushed the euwe-backport-network-task branch from 05e1d05 to 0b86cdd Compare January 12, 2017 02:56
@miq-bot
Copy link
Member

miq-bot commented Jan 12, 2017

Checked commit tzumainn@0b86cdd with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
8 files checked, 7 offenses detected

app/controllers/cloud_network_controller.rb

app/helpers/application_helper/toolbar/cloud_networks_center.rb

spec/controllers/cloud_network_controller_spec.rb

@simaishi
Copy link
Contributor

@martinpovolny @gildub is this good to go?

@gildub
Copy link
Contributor

gildub commented Jan 13, 2017

@simaishi, This is good to go! Thanks

@simaishi simaishi merged commit 583b678 into ManageIQ:euwe Jan 13, 2017
@simaishi simaishi removed the euwe/yes label Jan 13, 2017
@simaishi simaishi modified the milestone: Sprint 52 Ending Jan 16, 2017 Jan 13, 2017
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.

5 participants