Return-Path: X-Original-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AA16F9AF5 for ; Thu, 27 Oct 2011 11:17:08 +0000 (UTC) Received: (qmail 99339 invoked by uid 500); 27 Oct 2011 11:17:08 -0000 Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org Received: (qmail 99325 invoked by uid 500); 27 Oct 2011 11:17:08 -0000 Mailing-List: contact deltacloud-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-dev@incubator.apache.org Received: (qmail 99317 invoked by uid 99); 27 Oct 2011 11:17:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Oct 2011 11:17:08 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of mfojtik@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Oct 2011 11:17:01 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9RBGdec005660 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 27 Oct 2011 07:16:39 -0400 Received: from dhcp-29-121.brq.redhat.com (dhcp-29-121.brq.redhat.com [10.34.29.121]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9RBGXV3018035 for ; Thu, 27 Oct 2011 07:16:39 -0400 From: mfojtik@redhat.com To: deltacloud-dev@incubator.apache.org Subject: [PATCH core 6/8] CIMI: Backported bread_crumb_ext helper. Added support for additional local variables for CIMI view Date: Thu, 27 Oct 2011 13:17:26 +0200 Message-Id: <1319714248-71423-7-git-send-email-mfojtik@redhat.com> In-Reply-To: <1319714248-71423-1-git-send-email-mfojtik@redhat.com> References: <1319714248-71423-1-git-send-email-mfojtik@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Virus-Checked: Checked by ClamAV on apache.org From: Michal Fojtik Signed-off-by: Michal fojtik --- server/lib/cimi/helpers/cmwg_helper.rb | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/server/lib/cimi/helpers/cmwg_helper.rb b/server/lib/cimi/helpers/cmwg_helper.rb index 9dae5a1..e30ea17 100644 --- a/server/lib/cimi/helpers/cmwg_helper.rb +++ b/server/lib/cimi/helpers/cmwg_helper.rb @@ -16,14 +16,28 @@ module ApplicationHelper include Deltacloud - def render_resource(object_name, data) + def bread_crumb_ext + s = "
  • δ home
    • " + s+="
  • #{link_to_documentation}
    • " + s+="
" + end + + def render_resource(object_name, data, locals={}) respond_to do |format| format.xml do report_error 404 unless data + locals.each { |key, value| eval "@#{key}=value" } @object = data content_type cimi_content_type_for(object_name.to_s.camelize, :xml) haml :"#{object_name.to_s.pluralize}/show", :layout => false end + format.html do + report_error 404 unless data + locals.each { |key, value| eval "@#{key}=value" } + @object = data + content_type 'application/xhtml+xml' + haml :"#{object_name.to_s.pluralize}/show", :layout => false + end format.json do report_error 404 unless data content_type cimi_content_type_for(object_name.to_s.camelize, :json) -- 1.7.4.4