[PATCH aeolus-conductor 1/2] BZ:864192 Change Provider Account List default behaviour to return full detail

From: Martyn Taylor <mtaylor(a)redhat.com&gt; --- .../controllers/provider_accounts_controller.rb | 2 +- src/app/views/provider_accounts/_detail.xml.haml | 2 +- src/app/views/provider_accounts/_list.xml.haml | 2 +- .../shared_examples_for_provider_accounts_api.rb | 8 ++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/controllers/provider_accounts_controller.rb b/src/app/controllers/provider_accounts_controller.rb index a4c6ba9..bc5bc7d 100644 --- a/src/app/controllers/provider_accounts_controller.rb +++ b/src/app/controllers/provider_accounts_controller.rb @@ -28,7 +28,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 => false, :with_quota => false, :with_data => false } } + format.xml { render :partial => 'list.xml', :locals => { :provider_accounts => @provider_accounts, :with_credentials => false, :with_quota => false, :minimal => false } } end end diff --git a/src/app/views/provider_accounts/_detail.xml.haml b/src/app/views/provider_accounts/_detail.xml.haml index e8b7617..9b2688d 100644 --- a/src/app/views/provider_accounts/_detail.xml.haml +++ b/src/app/views/provider_accounts/_detail.xml.haml @@ -1,5 +1,5 @@ %provider_account{:id => provider_account.id, :href => api_provider_account_url(provider_account)} - -if local_assigns[:with_data] + -unless local_assigns[:minimal] -provider = provider_account.provider -provider_type = provider.provider_type %label= provider_account.name diff --git a/src/app/views/provider_accounts/_list.xml.haml b/src/app/views/provider_accounts/_list.xml.haml index 8323435..cf28087 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, :with_quota => with_quota, :with_data => with_data + =render 'detail', :provider_account => provider_account, :with_credentials => with_credentials, :with_quota => with_quota, :minimal => minimal diff --git a/src/spec/support/shared_examples_for_provider_accounts_api.rb b/src/spec/support/shared_examples_for_provider_accounts_api.rb index b3d3157..9fbc9e6 100644 --- a/src/spec/support/shared_examples_for_provider_accounts_api.rb +++ b/src/spec/support/shared_examples_for_provider_accounts_api.rb @@ -12,8 +12,12 @@ shared_examples_for "having XML with provider accounts" do xml_provider_account = xml_provider_accounts.xpath(&quot;//provider_account[(a)id=\&quot;#{provider_account.id}\&quot;]&quot;) xml_provider_account.xpath(&#39;(a)href&#39;).text.should be_eql(api_provider_account_url(provider_account)) # xml_provider_account.xpath('label').text.should be_eql(provider_account.name.to_s) - # it should not have provider accounts details - %w{label provider provider_type quota_used quota priority credentials}.each do |element| + + %w{label provider provider_type}.each do |element| + xml_provider_account.xpath(element).should_not be_empty + end + + %w{quota_used quota priority credentials}.each do |element| xml_provider_account.xpath(element).should be_empty end end -- 1.7.6.4