search for: parent_permission

...method such that we can use permissions.admins to get all the admins for an object - has_many :permissions, :dependent => :destroy, :include => :role, :order => "permissions.id ASC" + has_many :permissions, :dependent => :destroy, + :include => [:role, :pool, {:parent_permission => :pool}], + :order => "permissions.id ASC" has_one :quota, :dependent => :destroy diff --git a/src/app/views/user/_grid.rhtml b/src/app/views/user/_grid.rhtml index 10a10c8..c16c0c6 100644 --- a/src/app/views/user/_grid.rhtml +++ b/src/app/views/user/_grid.rhtm...

...c/test/fixtures/permissions.yml index 4895f3e..eed95fd 100644 --- a/src/test/fixtures/permissions.yml +++ b/src/test/fixtures/permissions.yml @@ -35,5 +35,9 @@ ovirtadmin_prodops_pool: ovirtadmin_corp_com_qa_pool: role: monitor uid: ovirtadmin - pool: corp_com_qa + pool: corp_qa_vmpool parent_permission: ovirtadmin_root +testuser_corp_com_qa_pool: + role: user + uid: testuser + pool: corp_qa_vmpool diff --git a/src/test/fixtures/vms.yml b/src/test/fixtures/vms.yml index 69b1c2b..b2711b2 100644 --- a/src/test/fixtures/vms.yml +++ b/src/test/fixtures/vms.yml @@ -65,6 +65,19 @@ foobar_prod1_vm:...

This resend includes the rebase, but fixes a problem I just noticed with nil/empty checks.

This is a resend of the 2-patch series from a week or so ago, needed to be rebased due to some commits on next

The following two patches should be applied in the order: * [PATCH server] Add svc_vm_actions method to VmService. * [PATCH server] Cloud UI layer to initiate actions on vms. The service layer patch should work fine on its own (and not break anything), but cloud patch relies on service being there.