[PATCH conductor 5/5] Cleans list of Provider Accounts in XML

pblaho at redhat.com pblaho at redhat.com
Tue Jul 31 13:33:55 UTC 2012


From: Petr Blaho <pblaho at redhat.com>

Adds option to show/hide quotas and toggles the same options for
credentials in index action.

Removed unneeded test.
---
 .../controllers/provider_accounts_controller.rb    |    4 ++--
 src/app/views/provider_accounts/_detail.xml.haml   |    5 +++--
 src/app/views/provider_accounts/_list.xml.haml     |    2 +-
 src/app/views/provider_accounts/show.xml.haml      |    2 +-
 .../provider_accounts_controller_spec.rb           |    1 -
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/controllers/provider_accounts_controller.rb b/src/app/controllers/provider_accounts_controller.rb
index 7620e3d..eaa7c0f 100644
--- a/src/app/controllers/provider_accounts_controller.rb
+++ b/src/app/controllers/provider_accounts_controller.rb
@@ -27,7 +27,7 @@ class ProviderAccountsController < ApplicationController
       #xml list of provider_accounts for aeolus-image, aeolus-image could work with prov. accounts list for givent provider
       #to resemble html views logic, so this route could be removed (provider_accounts could be user only as nested resource)
       #format.xml { render :text => ProviderAccount.xml_export(@provider_accounts) }
-      format.xml { render :partial => 'list.xml', :locals => { :provider_accounts => @provider_accounts, :with_credentials => true } }
+      format.xml { render :partial => 'list.xml', :locals => { :provider_accounts => @provider_accounts, :with_credentials => false, :with_quota => false } }
     end
   end
 
@@ -58,7 +58,7 @@ class ProviderAccountsController < ApplicationController
         end
         render :partial => @details_tab and return
       end
-      format.xml { render 'show', :locals => { :provider_account => @provider_account, :with_credentials => true } }
+      format.xml { render 'show', :locals => { :provider_account => @provider_account, :with_credentials => true, :with_quota => true } }
     end
   end
 
diff --git a/src/app/views/provider_accounts/_detail.xml.haml b/src/app/views/provider_accounts/_detail.xml.haml
index cf2984c..beb7a8c 100644
--- a/src/app/views/provider_accounts/_detail.xml.haml
+++ b/src/app/views/provider_accounts/_detail.xml.haml
@@ -9,5 +9,6 @@
       = render 'credentials', :creds_label_hash => provider_account.creds_label_hash
   -if provider_account.priority
     %priority= provider_account.priority
-  %quota_used= number_to_percentage provider_account.quota.percentage_used, :precision => 0
-  %quota= provider_account.quota.maximum_running_instances or t('provider_accounts.properties.unlimited')
+  -if local_assigns[:with_quota]
+    %quota_used= number_to_percentage provider_account.quota.percentage_used, :precision => 0
+    %quota= provider_account.quota.maximum_running_instances or t('provider_accounts.properties.unlimited')
diff --git a/src/app/views/provider_accounts/_list.xml.haml b/src/app/views/provider_accounts/_list.xml.haml
index 033d24c..9c4dc38 100644
--- a/src/app/views/provider_accounts/_list.xml.haml
+++ b/src/app/views/provider_accounts/_list.xml.haml
@@ -1,4 +1,4 @@
 !!! XML
 %provider_accounts
   - provider_accounts.each do |provider_account|
-    =render 'detail', :provider_account => provider_account, :with_credentials => with_credentials
+    =render 'detail', :provider_account => provider_account, :with_credentials => with_credentials, :with_quota => with_quota
diff --git a/src/app/views/provider_accounts/show.xml.haml b/src/app/views/provider_accounts/show.xml.haml
index 037cf4e..323a0a0 100644
--- a/src/app/views/provider_accounts/show.xml.haml
+++ b/src/app/views/provider_accounts/show.xml.haml
@@ -1,2 +1,2 @@
 !!! XML
-=render 'detail', :provider_account => provider_account, :with_credentials => with_credentials
+=render 'detail', :provider_account => provider_account, :with_credentials => with_credentials, :with_quota => with_quota
diff --git a/src/spec/controllers/provider_accounts_controller_spec.rb b/src/spec/controllers/provider_accounts_controller_spec.rb
index 9f32032..0ba2c0b 100644
--- a/src/spec/controllers/provider_accounts_controller_spec.rb
+++ b/src/spec/controllers/provider_accounts_controller_spec.rb
@@ -338,7 +338,6 @@ describe ProviderAccountsController do
               it {
                 subject.xpath('//error').size.should be_eql(1)
                 subject.xpath('//error/code').text.should be_eql('RecordNotFound')
-                subject.xpath('//error/message').text.should be_eql("Couldn't find ProviderAccount with ID=1")
               }
             end
           end
-- 
1.7.7.6




More information about the aeolus-devel mailing list