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

vm_controller and genericSessionMixin update #647

Closed
wants to merge 322 commits into from

Conversation

LANeo64
Copy link

@LANeo64 LANeo64 commented Mar 10, 2017

@miq-bot assign himdel
@miq-bot add_label refactoring,euwe/no
Added changes to vm_controller to be compatible with GenereicSessionMixin

@LANeo64 LANeo64 changed the title [WIP] Merge [WIP] vm_controller and genericSessionMixin update Mar 10, 2017
@LANeo64
Copy link
Author

LANeo64 commented Mar 10, 2017

@miq-bot remove_label wip

@miq-bot miq-bot changed the title [WIP] vm_controller and genericSessionMixin update vm_controller and genericSessionMixin update Mar 10, 2017
@miq-bot miq-bot removed the wip label Mar 10, 2017
romanblanco and others added 19 commits March 11, 2017 20:19
Use `controllerAs vm` syntax for the Provider Foreman Angular controller (cleaner approach)
the session var is never used, and nor is @cats, not in here, nor in application controller...
only ever saved to session, never assigned to
only ever saved to session, never assigned to
only ever saved to session and back, no other uses
@display = session["#{prefix}_display".to_sym]
@filters = session["#{prefix}_filters".to_sym]
@catinfo = session["#{prefix}_catinfo".to_sym]
@cats = session["#{prefix}_cats".to_sym]
Copy link
Contributor

@himdel himdel Mar 13, 2017

Choose a reason for hiding this comment

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

Sorry, removing @cats in #664 .. so no point in adding to the common mixin.. (turns out @cats is dead :))

yaacov and others added 24 commits March 23, 2017 13:08
…oject-id-when-adding-gce

Update 'Project' to 'Project ID' when adding GCE Provider
…h_flash

Fix volume attach/detach flash messages
For middleware UI, only allow operations on mutable servers.
Make SCVMM "name@realm" hint declarative
Remove dead non-angular forms for EMS*
Add filter selections for the ad-hoc metrics page
Added spec test to verify that `fetch_playook_details` sets data for tabs correctly.
…alue

Fixed checks around retirement dialog values.
Code fix to display Resource Pools value/icon for selected Cluster

https://bugzilla.redhat.com/show_bug.cgi?id=1324610
…ost_compare

Fix double rendered icon on Hosts comparison delete column button
Crop the powerstate svg in quadicons using border-radius
…nsible_credentials

Extended textual summary for ansible credentials
[WIP] VM_controller session in generic_session_mixin

[WIP]completed vm_controller to be compatible with GenericSessionMixin

[WIP]vm_controller and generic session mixin update

[WIP]vm_controller added private keyword
@miq-bot
Copy link
Member

miq-bot commented Mar 24, 2017

Checked commits LANeo64/manageiq-ui-classic@29ad7cb~...424d42f with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
2 files checked, 0 offenses detected
Everything looks good. 👍

@LANeo64
Copy link
Author

LANeo64 commented Mar 24, 2017

Performed a rebase and made suggested changes by @himdel

@himdel
Copy link
Contributor

himdel commented Mar 24, 2017

@LANeo64 looks like the main problem is that you don't have a branch for this PR, you're creating it from your master branch.

So, I suggest you close this PR, get your master branch to be identical to upstream/master (for example, by doing git checkout upstream/master; git branch -D master; git checkout -b master), and then you can create a fresh branch for this PR, and cherry-pick the right commits (also, please note that anything called "Merge ..." is not one of them).

@himdel himdel closed this Mar 27, 2017
@himdel
Copy link
Contributor

himdel commented Apr 5, 2017

Replaced by #865

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.