[PATCH aeolus-conductor] BZ:864190 Change Provider List default behaviour to show provider data

mtaylor at redhat.com mtaylor at redhat.com
Fri Oct 12 13:05:25 UTC 2012


From: Martyn Taylor <mtaylor at redhat.com>

Since we do not want to break API behaviour from v1.0.  Here I have set the default
API behaviour to return the full provider data.  Users can now pass in an option
minimal paramter to retreived only the provider href and id in the provider collections
---
 src/app/controllers/providers_controller.rb       |    2 +-
 src/app/views/providers/_list.xml.haml            |    2 +-
 src/spec/controllers/providers_controller_spec.rb |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb
index b475dee..dfd577c 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -40,7 +40,7 @@ class ProvidersController < ApplicationController
     respond_to do |format|
       format.html
       format.js { render :partial => 'list' }
-      format.xml { render :partial => 'list.xml' , :locals => { :with_data => params[:with_data] }}
+      format.xml { render :partial => 'list.xml' , :locals => { :minimal => params[:minimal] }}
     end
   end
 
diff --git a/src/app/views/providers/_list.xml.haml b/src/app/views/providers/_list.xml.haml
index 72e20da..7cd0bdb 100644
--- a/src/app/views/providers/_list.xml.haml
+++ b/src/app/views/providers/_list.xml.haml
@@ -2,7 +2,7 @@
 %providers
   - @providers.each do |p|
     %provider{:id => p.id, :href => api_provider_url(p)}
-      -if local_assigns[:with_data]
+      -unless local_assigns[:minimal]
         %name= p.name
         %url= p.url
         %provider_type= p.provider_type.deltacloud_driver
diff --git a/src/spec/controllers/providers_controller_spec.rb b/src/spec/controllers/providers_controller_spec.rb
index 2249ee7..ad9a284 100644
--- a/src/spec/controllers/providers_controller_spec.rb
+++ b/src/spec/controllers/providers_controller_spec.rb
@@ -36,7 +36,7 @@ describe ProvidersController do
           # xml_provider.xpath('name').text.should be_eql(provider.name.to_s)
           # it should not have details of providers
           %w{name url provider_type deltacloud_provider}.each do |element|
-            xml_provider.xpath(element).should be_empty
+            xml_provider.xpath(element).should_not be_empty
           end
         end
       end
-- 
1.7.6.4




More information about the aeolus-devel mailing list