You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by mf...@redhat.com on 2012/04/17 15:40:00 UTC
[PATCH core 21/32] Core: Updated entrypoint views to list collections from Deltacloud module
From: Michal Fojtik <mf...@redhat.com>
Signed-off-by: Michal fojtik <mf...@redhat.com>
---
server/views/api/show.html.haml | 7 ++++---
server/views/api/show.xml.haml | 13 ++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/server/views/api/show.html.haml b/server/views/api/show.html.haml
index 265739d..66d1f3a 100644
--- a/server/views/api/show.html.haml
+++ b/server/views/api/show.html.haml
@@ -3,10 +3,11 @@
%div{ :'data-role' => :content, :'data-theme' => 'c'}
%ul{ :'data-role' => :listview, :'data-inset' => 'true'}
- - @collections.sort_by { |k| k.to_s }.each do |key|
- %li= link_to key.to_s.gsub('_', ' ').titlecase, api_url_for(key), :'data-icon' => "arrow-r", :'data-ajax' => false
+ - Deltacloud.collections.each do |c|
+ - next unless c.operation(:index).has_capability?
+ %li= link_to c.collection_name.to_s.gsub('_', ' ').titlecase, api_url_for(c.collection_name), :'data-icon' => "arrow-r", :'data-ajax' => false
-- if @providers.size > 1
+- unless driver.configured_providers.empty?
%div{ :'data-role' => :footer, :'data-theme' => 'a'}
%form{ :action => settings.root_url, :method => :post, :'data-ajax' => 'false'}
- if @driver_name
diff --git a/server/views/api/show.xml.haml b/server/views/api/show.xml.haml
index 2b9f653..ad2df09 100644
--- a/server/views/api/show.xml.haml
+++ b/server/views/api/show.xml.haml
@@ -1,7 +1,6 @@
-%api{ :version => settings.version, :driver => driver_symbol }
- - for entry_point in entry_points
- %link{ :rel=>entry_point[0], :href=>entry_point[1] }
- - for feature in driver.features(entry_point[0])
- %feature{ :name=>feature.name }
- - for name,value in feature.constraints
- %constraint{ :name=>name, :value=>value }
+%api{ :version => settings.version, :driver => driver_symbol, :provider => Thread.current[:provider] || ENV['API_PROVIDER'] }
+ - Deltacloud.collections.each do |c|
+ - next unless c.operation(:index).has_capability?
+ %link{ :rel => c.collection_name, :href => self.send(:"#{c.collection_name}_url")}
+ - c.features.select { |f| driver.class.has_feature?(c.collection_name, f.name) }.each do |f|
+ %feature{ :name => f.name }
--
1.7.10