Scott Seago
2009-Jan-21 22:02 UTC
[Ovirt-devel] [PATCH] additional changes for Bug 466719.
Fixed incorrect column name for load_average -- so sorting works now. Also
removed the ability to sort on num_cpus and cpu_speed. These are now stored in a
separate object, so the prior code for this was broken, and it doesn't seem
like it would be a high priority to support sorting on these fields.
Signed-off-by: Scott Seago <sseago at redhat.com>
---
src/app/views/host/_grid.rhtml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/views/host/_grid.rhtml b/src/app/views/host/_grid.rhtml
index 21b563e..663a55d 100644
--- a/src/app/views/host/_grid.rhtml
+++ b/src/app/views/host/_grid.rhtml
@@ -36,12 +36,12 @@
{display: 'UUID', name : 'uuid', width : 180, align:
'left'}<% if !is_popup %>,<% end %>
<% if !is_popup %>
{display: 'Hypervisor', name : 'hypervisor_type',
width : 60, align: 'left'},
- {display: 'CPUs', name : 'num_cpus', width : 30,
align: 'left'},
- {display: 'Speed (MHz)', name : 'cpu_speed', width
: 70, align: 'right'},
+ {display: 'CPUs', width : 30, align: 'left'},
+ {display: 'Speed (MHz)', width : 70, align:
'right'},
{display: 'Arch', name : 'arch', width : 50, align:
'right'},
{display: 'RAM (MB)', name : 'memory', width : 60,
align: 'right'},
{display: 'Status', name : 'is_disabled', width :
110, align: 'right'},
- {display: 'Load', name : 'load', width: 180,
sortable : false, align: 'left', process: <%= table_id
%>_load_widget }
+ {display: 'Load', name : 'load_average', width:
180, sortable : false, align: 'left', process: <%= table_id
%>_load_widget }
<% end %>
],
sortname: "hostname",
--
1.6.0.6
Jason Guiditta
2009-Jan-26 18:36 UTC
[Ovirt-devel] [PATCH] additional changes for Bug 466719.
On Wed, 2009-01-21 at 22:02 +0000, Scott Seago wrote:> Fixed incorrect column name for load_average -- so sorting works now. Also removed the ability to sort on num_cpus and cpu_speed. These are now stored in a separate object, so the prior code for this was broken, and it doesn't seem like it would be a high priority to support sorting on these fields. > > Signed-off-by: Scott Seago <sseago at redhat.com> > --- > src/app/views/host/_grid.rhtml | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/app/views/host/_grid.rhtml b/src/app/views/host/_grid.rhtml > index 21b563e..663a55d 100644 > --- a/src/app/views/host/_grid.rhtml > +++ b/src/app/views/host/_grid.rhtml > @@ -36,12 +36,12 @@ > {display: 'UUID', name : 'uuid', width : 180, align: 'left'}<% if !is_popup %>,<% end %> > <% if !is_popup %> > {display: 'Hypervisor', name : 'hypervisor_type', width : 60, align: 'left'}, > - {display: 'CPUs', name : 'num_cpus', width : 30, align: 'left'}, > - {display: 'Speed (MHz)', name : 'cpu_speed', width : 70, align: 'right'}, > + {display: 'CPUs', width : 30, align: 'left'}, > + {display: 'Speed (MHz)', width : 70, align: 'right'}, > {display: 'Arch', name : 'arch', width : 50, align: 'right'}, > {display: 'RAM (MB)', name : 'memory', width : 60, align: 'right'}, > {display: 'Status', name : 'is_disabled', width : 110, align: 'right'}, > - {display: 'Load', name : 'load', width: 180, sortable : false, align: 'left', process: <%= table_id %>_load_widget } > + {display: 'Load', name : 'load_average', width: 180, sortable : false, align: 'left', process: <%= table_id %>_load_widget } > <% end %> > ], > sortname: "hostname",ACK, this works fine for me, no errors. One thought though, and this could be a separate patch if we want to do it, but for vms the column is just called load, seems to be they should both be either 'load' or 'load_average' to keep it consistent. If we want to do this, I think we should try to before we get to 1.0 -j