search for: smartpool

...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 nested_pools.each do |pool_element| pool = pool_element[:obj] - if pool.hasChildren + if pool.hasChildren and pool_element.has_key?(:children) if pool.name == user pool_element[:children].each do |child_element|...

...ed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 0a63723..3c95684 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -57,7 +57,9 @@ class Pool < ActiveRecord::Base :in => %w( DirectoryPool HardwarePool VmResourcePool SmartPool ) # overloading this 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, + :inclu...

...hosts_per_page.nil? ? hosts_per_page = 40: hosts_per_page = hosts_per_page %> +<% hosts_per_page = 40 if !defined?(hosts_per_page) or hosts_per_page.nil? %> <% if (hwpool.nil? or ((hwpool.is_a? HardwarePool) and (hwpool.hosts.size > hosts_per_page)) or ((hwpool.is_a? SmartPool) and (hwpool.tagged_hosts.size > hosts_per_page))) diff --git a/src/app/views/vm/migrate.rhtml b/src/app/views/vm/migrate.rhtml index f94723a..9165425 100644 --- a/src/app/views/vm/migrate.rhtml +++ b/src/app/views/vm/migrate.rhtml @@ -44,6 +44,7 @@ :hwpool => @vm.get_hardware_p...

...pre_addhost - @pool = Pool.find(params[:hardware_pool_id]) - @parent = @pool.parent - set_perms(@pool) - authorize_admin - # Old addhost - @hardware_pool = Pool.find(params[:hardware_pool_id]) - render :layout => 'popup' - end - def add_to_smart_pool @pool = SmartPool.find(params[:smart_pool_id]) render :layout => 'popup' end - # FIXME: We implement the standard controller actions, but catch - # them in filters and kick out friendly warnings that you can't - # perform them on hosts. Tat's overkill - the only way for a user - # to...