Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F3F84D858 for ; Fri, 20 Jul 2012 09:59:26 +0000 (UTC) Received: (qmail 61011 invoked by uid 500); 20 Jul 2012 09:59:24 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 60909 invoked by uid 500); 20 Jul 2012 09:59:24 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 60303 invoked by uid 99); 20 Jul 2012 09:59:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jul 2012 09:59:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DC14615E94; Fri, 20 Jul 2012 09:59:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mfojtik@apache.org To: commits@deltacloud.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [12/65] git commit: Core: The 'supported_collections' helper now return correct array Message-Id: <20120720095921.DC14615E94@tyr.zones.apache.org> Date: Fri, 20 Jul 2012 09:59:21 +0000 (UTC) Core: The 'supported_collections' helper now return correct array Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/da550725 Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/da550725 Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/da550725 Branch: refs/heads/master Commit: da550725b60e7003825724feeb96996e3608ec29 Parents: abd83a5 Author: Michal Fojtik Authored: Wed Jul 18 17:52:02 2012 +0200 Committer: Michal fojtik Committed: Fri Jul 20 11:57:42 2012 +0200 ---------------------------------------------------------------------- server/lib/deltacloud/helpers/deltacloud_helper.rb | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/da550725/server/lib/deltacloud/helpers/deltacloud_helper.rb ---------------------------------------------------------------------- diff --git a/server/lib/deltacloud/helpers/deltacloud_helper.rb b/server/lib/deltacloud/helpers/deltacloud_helper.rb index cec22ac..047e1b2 100644 --- a/server/lib/deltacloud/helpers/deltacloud_helper.rb +++ b/server/lib/deltacloud/helpers/deltacloud_helper.rb @@ -19,6 +19,7 @@ module Deltacloud::Helpers require 'benchmark' def supported_collections + collection_arr = [] Deltacloud::Collections.deltacloud_modules.each do |m| m.collections.each do |c| # Get the required capability for the :index operation (like 'realms' or 'instance_state_machine') @@ -27,8 +28,10 @@ module Deltacloud::Helpers # for the Sinatra::Base class evaluate to 'true' next if m.settings.respond_to?(:capability) and !m.settings.capability(index_operation_capability) yield c if block_given? + collection_arr << c end end + collection_arr end def auth_feature_name