search for: full_items

...rb b/src/app/controllers/resources_controller.rb index 9d1074a..87f07f5 100644 --- a/src/app/controllers/resources_controller.rb +++ b/src/app/controllers/resources_controller.rb @@ -63,7 +63,9 @@ class ResourcesController < PoolController def vms_json svc_show(params[:id]) - super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true) + super(:full_items => @pool.vms, + :find_opts => {:select => Vm.calc_uptime}, + :include_pool => :true) end def delete diff --git a/src/app/controllers/smart_pools_controller.rb b/src/app/cont...

...rb b/src/app/controllers/resources_controller.rb index 9d1074a..87f07f5 100644 --- a/src/app/controllers/resources_controller.rb +++ b/src/app/controllers/resources_controller.rb @@ -63,7 +63,9 @@ class ResourcesController < PoolController def vms_json svc_show(params[:id]) - super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true) + super(:full_items => @pool.vms, + :find_opts => {:select => Vm.calc_uptime}, + :include_pool => :true) end def delete diff --git a/src/app/controllers/smart_pools_controller.rb b/src/app/cont...

...rb b/src/app/controllers/resources_controller.rb index 9d1074a..87f07f5 100644 --- a/src/app/controllers/resources_controller.rb +++ b/src/app/controllers/resources_controller.rb @@ -63,7 +63,9 @@ class ResourcesController < PoolController def vms_json svc_show(params[:id]) - super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true) + super(:full_items => @pool.vms, + :find_opts => {:select => Vm.calc_uptime}, + :include_pool => :true) end def delete diff --git a/src/app/controllers/smart_pools_controller.rb b/src/app/cont...

...b b/src/app/controllers/resources_controller.rb index 9d1074a..7188db8 100644 --- a/src/app/controllers/resources_controller.rb +++ b/src/app/controllers/resources_controller.rb @@ -63,7 +63,12 @@ class ResourcesController < PoolController def vms_json svc_show(params[:id]) - super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true) + super(:full_items => @pool.vms, :find_opts => {:select => "*, case + when state='running' then + (cast(total_uptime || ' sec' as interval) + + (now() - total_uptime_timest...

...a/src/app/controllers/resources_controller.rb b/src/app/controllers/resources_controller.rb index efd3cb6..9d1074a 100644 --- a/src/app/controllers/resources_controller.rb +++ b/src/app/controllers/resources_controller.rb @@ -66,12 +66,6 @@ class ResourcesController < PoolController super(:full_items => @pool.vms, :find_opts => {}, :include_pool => :true) end - def additional_create_params - {:parent_id => (params[:hardware_pool] ? - params[:hardware_pool][:parent_id] : - params[:parent_id])} - end - def delete vm_pool_ids = pa...

...:state, :calc_uptime, :id] + :state, :contact, :os, :eol, :comment ] if (@pool.is_a? VmResourcePool) and @pool.get_hardware_pool.can_view(@user) - attr_list.insert(3, [:host, :hostname]) + attr_list.insert(2, [:host, :hostname]) end json_list(args[:full_items], attr_list, [:all], args[:find_opts]) end diff --git a/src/app/views/vm/_form.rhtml b/src/app/views/vm/_form.rhtml index adb75d2..13e73db 100644 --- a/src/app/views/vm/_form.rhtml +++ b/src/app/views/vm/_form.rhtml @@ -8,10 +8,14 @@ <div class="form_heading clickable open">...

...if @nolayout - render :template => 'layouts/popup-error', :layout => 'help-and-content' - else - render :template => 'layouts/popup-error', :layout => 'popup' - end - end - - # don't define find_opts for array inputs - def json_hash(full_items, attributes, arg_list=[], find_opts={}, id_method=:id) - page = params[:page].to_i - paginate_opts = {:page => page, - :order => "#{params[:sortname]} #{params[:sortorder]}", - :per_page => params[:rp]} - arg_list << find_opt...

Note that one of the 8 patches (#6) will be sent separately in reply to this email, as some of the replaced lines are too long, so git won't let me send the email. However, there is nothing wrong with that patch, and it should be applied in the sequence listed below. Note also that I assume this will be tested on a clean f11 install, rather than an upgrade of an existing ovirt server