Signed-off-by: Scott Seago <[email protected]>
---
src/app/controllers/instance_controller.rb | 4 +++-
src/app/controllers/pool_controller.rb | 4 +++-
src/app/models/instance.rb | 8 +++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/app/controllers/instance_controller.rb
b/src/app/controllers/instance_controller.rb
index 0a65064..039ed3a 100644
--- a/src/app/controllers/instance_controller.rb
+++ b/src/app/controllers/instance_controller.rb
@@ -51,7 +51,9 @@ class InstanceController < ApplicationController
i.name,
i.state,
i.hardware_profile.name,
- i.image.name
+ i.image.name,
+ i.cloud_account.nil? ? "" : i.cloud_account.provider.name,
+ i.cloud_account.nil? ? "" : i.cloud_account.name
]
end
diff --git a/src/app/controllers/pool_controller.rb
b/src/app/controllers/pool_controller.rb
index d557d57..122e3d7 100644
--- a/src/app/controllers/pool_controller.rb
+++ b/src/app/controllers/pool_controller.rb
@@ -105,7 +105,9 @@ class PoolController < ApplicationController
i.name,
i.state,
i.hardware_profile.name,
- i.image.name
+ i.image.name,
+ i.cloud_account.nil? ? "" : i.cloud_account.provider.name,
+ i.cloud_account.nil? ? "" : i.cloud_account.name
]
end
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index e61b7cc..66fae6f 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
@@ -63,11 +63,13 @@ class Instance < ActiveRecord::Base
# html table structure
COLUMNS = [
{:id => 'id', :header => '<input type="checkbox" id="image_id_all"
onclick="checkAll(event)">', :opts => {:checkbox_id => 'image_id', :searchable
=> false, :sortable => false, :width => '1px', :class => 'center'}},
- {:id => 'actions', :header => 'Actions', :opts => {:width => "15%",
:sortable => false}},
+ {:id => 'actions', :header => 'Actions', :opts => {:width => "10%",
:sortable => false}},
{:id => 'name', :header => 'Name', :opts => {:width => "25%"}},
- {:id => 'state', :header => 'State', :opts => {:width => "15%"}},
+ {:id => 'state', :header => 'State', :opts => {:width => "10%"}},
{:id => 'hwprofile', :header => 'HW profile', :opts => {:width => "15%"}},
- {:id => 'image', :header => 'Image', :opts => {:sortable => false}},
+ {:id => 'image', :header => 'Image', :opts => {:sortable => false, :width
=> "15%"}},
+ {:id => 'provider', :header => 'Provider', :opts => {:width => "10%"}},
+ {:id => 'account', :header => 'Account', :opts => {:width => "10%"}},
]
SEARCHABLE_COLUMNS = %w(name state)
--
1.6.2.5
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
