[Ovirt-devel] [PATCH] small merge fixes

[Mohammed Morsi]

Signed-off-by: Mohammed Morsi <mmorsi at redhat.com>
---
 wui/src/app/views/hardware/show.html.erb  |    3 ++-
 wui/src/app/views/hardware/show_vms.rhtml |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/wui/src/app/views/hardware/show.html.erb b/wui/src/app/views/hardware/show.html.erb
index 2952f23..1c8092a 100644
--- a/wui/src/app/views/hardware/show.html.erb
+++ b/wui/src/app/views/hardware/show.html.erb
@@ -11,6 +11,8 @@
 
 <%= render_component :controller=> 'graph', :action => 'history_graphs', :id => @pool.id %>
 
+<%= render_component :controller=> 'graph', :action => 'snapshot_graph', :id => @pool.id %>
+
 <div class="selection_detail" id="hwpool_selection">
   <div>Hardware pool quota details.</div>
 </div>
@@ -25,4 +27,3 @@
 </script>
 <%- end -%>
 
-<%= render_component :controller=> 'graph', :action => 'snapshot_graph', :id => @pool.id %>
diff --git a/wui/src/app/views/hardware/show_vms.rhtml b/wui/src/app/views/hardware/show_vms.rhtml
index 7703e44..378a0c2 100644
--- a/wui/src/app/views/hardware/show_vms.rhtml
+++ b/wui/src/app/views/hardware/show_vms.rhtml
@@ -32,7 +32,7 @@
     }
     if (selected_ids.length == 1)
     {
-      $('#vmpools_selection').load('<%= url_for :controller => "resources", :action => "quick_summary" %>/' + parseInt(selected_ids[0].substring(3)));
+      $('#vmpool_selection').load('<%= url_for :controller => "resources", :action => "quick_summary" %>/' + parseInt(selected_ids[0].substring(3)));
     }
   }
 </script>
-- 
1.5.4.1

>From b7f52a4d09a1cb3f22070284392fa37aa5bd210e Mon Sep 17 00:00:00 2001
From: Hugh O. Brock <hbrock at harpcolumn.com>
Date: Tue, 3 Jun 2008 12:10:54 -0400
Subject: [PATCH] Comment out a 'require' that was pulling in stats.rb before we were ready for it (coming later). Also added a javascript hack from mmorsi to get flexigrid working again.


Signed-off-by: Hugh O. Brock <hbrock at harpcolumn.com>
---
 wui/src/app/controllers/graph_controller.rb |    2 +-
 wui/src/app/views/graph/_load_graph.rhtml   |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wui/src/app/controllers/graph_controller.rb b/wui/src/app/controllers/graph_controller.rb
index 205b418..4333649 100644
--- a/wui/src/app/controllers/graph_controller.rb
+++ b/wui/src/app/controllers/graph_controller.rb
@@ -1,4 +1,4 @@
-require 'util/stats/Stats'
+# require 'util/stats/Stats'
 
 class GraphController < ApplicationController
   layout nil
diff --git a/wui/src/app/views/graph/_load_graph.rhtml b/wui/src/app/views/graph/_load_graph.rhtml
index 7cf61e1..1cb81ba 100644
--- a/wui/src/app/views/graph/_load_graph.rhtml
+++ b/wui/src/app/views/graph/_load_graph.rhtml
@@ -26,7 +26,9 @@ function load_widget(div, target){
                    svg.graph.redraw();
              }
    );
-   $(div).children().filter("svg").attr('height', 25).attr('width', 200);
+//   $(div).children().filter("svg").attr('height', 25).attr('width', 200);
+   $(div).children().filter("svg").attr("height").baseVal.value = 25;
+   $(div).children().filter("svg").attr("width").baseVal.value = 200;
 };
 
 // invoked when a row containing a load widgit is selected
-- 
1.5.4.1