--- src/app/controllers/pool_controller.rb | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index 2839cac..d557d57 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -98,11 +98,22 @@ class PoolController < ApplicationController :conditions => {:pool_id => @pool.id} )
+ recs = @instances.map do |i| + [ + i.id, + i.get_action_list.map {|action| "<a href="#{url_for :controller => "instance", :action => "instance_action", :id => i.id, :instance_action => action}">#{action}</a>"}.join(" | "), + i.name, + i.state, + i.hardware_profile.name, + i.image.name + ] + end + render :json => { :sEcho => params[:sEcho], :iTotalRecords => @instances.total_entries, :iTotalDisplayRecords => @instances.total_entries, - :aaData => @instances.map {|i| [i.id, "", i.name, i.state, i.hardware_profile.name, i.image.name]} + :aaData => recs } end
On Mon, May 24, 2010 at 11:18:50AM +0200, Jan Provaznik wrote:
src/app/controllers/pool_controller.rb | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/app/controllers/pool_controller.rb b/src/app/controllers/pool_controller.rb index 2839cac..d557d57 100644 --- a/src/app/controllers/pool_controller.rb +++ b/src/app/controllers/pool_controller.rb @@ -98,11 +98,22 @@ class PoolController < ApplicationController :conditions => {:pool_id => @pool.id} )
- recs = @instances.map do |i|
[
i.id,
i.get_action_list.map {|action| "<a href=\"#{url_for :controller => "instance", :action => "instance_action", :id => i.id, :instance_action => action}\">#{action}</a>"}.join(" | "),
i.name,
i.state,
i.hardware_profile.name,
i.image.name
]
- end
- render :json => { :sEcho => params[:sEcho], :iTotalRecords => @instances.total_entries, :iTotalDisplayRecords => @instances.total_entries,
:aaData => @instances.map {|i| [i.id, "", i.name, i.state, i.hardware_profile.name, i.image.name]}
} end:aaData => recs
-- 1.6.2.5
deltacloud-devel mailing list deltacloud-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/deltacloud-devel
Works for me, ACK.
Thank you, Steve
deltacloud-devel@lists.fedorahosted.org