Ovirt devel - Sep 2009 - [PATCH server] fix live migration

From: root <root at linagora-ovirt.netaktiv.com>

---
 src/app/views/host/_grid.rhtml |    2 +-
 src/app/views/vm/migrate.rhtml |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/app/views/host/_grid.rhtml b/src/app/views/host/_grid.rhtml
index 663a55d..698dc95 100644
--- a/src/app/views/host/_grid.rhtml
+++ b/src/app/views/host/_grid.rhtml
@@ -1,7 +1,7 @@
 <%= render :partial => 'graph/load_graph.rhtml' %>
 <% pool_controller = 'hardware' unless (defined? pool_controller)
and !(pool_controller.nil?) %>
 
-<% 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_pool,
              :exclude_pool => nil,
              :exclude_host => @vm.host_id,
+             :is_popup => true,
              :checkboxes => false,
              :on_select => "migrate_vm_select",
              :on_deselect => "migrate_vm_deselect",
-- 
1.6.2.5

On Tue, 2009-09-08 at 13:17 +0000, mloiseleur at linagora.com
wrote:
> From: root <root at linagora-ovirt.netaktiv.com>
> 
> ---
>  src/app/views/host/_grid.rhtml |    2 +-
>  src/app/views/vm/migrate.rhtml |    1 +
>  2 files changed, 2 insertions(+), 1 deletions(-)
> 
ACK and pushed, not sure how that ever worked from looking at it.