search for: smart_pools

Signed-off-by: Loiseleur Michel <mloiseleur at linagora.com> --- app/models/smart_pool.rb | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/models/smart_pool.rb b/app/models/smart_pool.rb index 1f718a8..9afc354 100644 --- a/app/models/smart_pool.rb +++ b/app/models/smart_pool.rb @@ -62,18 +62,16 @@ class SmartPool < Pool if nested_pools

...++++--------- src/app/views/hardware/show_vms.rhtml | 17 +++++++---------- src/app/views/network/list.html.erb | 9 ++++----- src/app/views/resources/show_vms.rhtml | 25 +++++++++++-------------- src/app/views/search/results.rhtml | 4 ++-- src/app/views/smart_pools/show_hosts.rhtml | 9 ++++----- src/app/views/smart_pools/show_pools.rhtml | 9 ++++----- src/app/views/smart_pools/show_storage.rhtml | 9 ++++----- src/app/views/smart_pools/show_vms.rhtml | 9 ++++----- src/app/views/task/_show.rhtml | 19 +++++++++++--------...

...ool.rhtml index cdfe92d..161496b 100644 --- a/src/app/views/vm/add_to_smart_pool.rhtml +++ b/src/app/views/vm/add_to_smart_pool.rhtml @@ -20,7 +20,8 @@ :vms_per_page => 40} %> </div> -<%= popup_footer("add_vms_to_smart_pool('#{url_for :controller => "smart_pools", +<%= popup_footer("add_vms_to_current_smart_pool('#{url_for :controller => + "smart_pools", :action => "add_vms",...

...alert } diff --git a/src/app/models/host.rb b/src/app/models/host.rb index 588137b..4975205 100644 --- a/src/app/models/host.rb +++ b/src/app/models/host.rb @@ -54,15 +54,6 @@ class Host < ActiveRecord::Base has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy has_many :smart_pools, :through => :smart_pool_tags - # reverse cronological collection of vm history - # each collection item contains vm that was running on host - # time started, and time ended (see VmHostHistory) - has_many :vm_host_histories, - :order => 'time_started DESC', -...

redux patchset permitting a vm to be associated with multiple networks and vice-versa. updated patchset so as to be applicable against current oVirt server HEAD these patches may be applied in any order, they all need to be pushed together

This patchset contains changes to the ovirt server frontend, backend, and tests components, permitting vms to be associated with multiple networks and vice versa. Also included are two patches which are required for the frontend bits; a patch adding collapsable sections to the vm form, which in itself depends on the second patch that provides default values for the cpu and memory vm table fields

...dels/vm.rb +++ b/src/app/models/vm.rb @@ -29,7 +29,7 @@ class Vm < ActiveRecord::Base end has_and_belongs_to_many :storage_volumes - belongs_to :network + has_many :nics, :dependent => :destroy has_many :smart_pool_tags, :as => :tagged, :dependent => :destroy has_many :smart_pools, :through => :smart_pool_tags @@ -45,8 +45,8 @@ class Vm < ActiveRecord::Base validates_presence_of :uuid, :description, :num_vcpus_allocated, :boot_device, :memory_allocated_in_mb, - :memory_allocated, :vnic_mac_addr, -...