From: Tomas Sedovic <[email protected]>
---
src/app/controllers/resources/pools_controller.rb | 2 +-
src/app/views/resources/pools/_list.haml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/controllers/resources/pools_controller.rb
b/src/app/controllers/resources/pools_controller.rb
index 9878494..02ba8f4 100644
--- a/src/app/controllers/resources/pools_controller.rb
+++ b/src/app/controllers/resources/pools_controller.rb
@@ -66,8 +66,8 @@ class Resources::PoolsController < ApplicationController
def load_pools
@header = [
{ :name => "Pool name", :sort_attr => :name },
- { :name => "% Quota used", :sortable => false },
{ :name => "Quota (Instances)", :sort_attr => "quotas.total_instances"},
+ { :name => "% Quota used", :sortable => false },
{ :name => "Pool Family", :sort_attr => "pool_families.name" }
]
@pools = Pool.paginate(:all, :include => [ :quota, :pool_family ],
diff --git a/src/app/views/resources/pools/_list.haml
b/src/app/views/resources/pools/_list.haml
index 51b25af..605dbd7 100644
--- a/src/app/views/resources/pools/_list.haml
+++ b/src/app/views/resources/pools/_list.haml
@@ -1,5 +1,5 @@
- form_tag do
- = restful_submit_tag "New Pool", "new", new_resources_pool_path, 'GET'
+ = link_to "New Pool", new_resources_pool_path, { :class => 'button' }
%p
Select:
= link_to "All", @url_params.merge(:select => 'all')
@@ -14,9 +14,9 @@
= check_box(:pool, "selected[#{pool.id}]", :checked => selected)
= link_to pool.name, resources_pool_path(pool)
%td
- =((pool.quota.maximum_running_instances ||
0)/100)*pool.quota.total_instances
- ='%'
+ = pool.quota.maximum_running_instances or 'unlimited'
%td
- =pool.quota.total_instances
+ = pool.quota.percentage_used
+ ='%'
%td
- =pool.pool_family.name
+ = pool.pool_family.name
--
1.7.3.4
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
