Return-Path: X-Original-To: apmail-deltacloud-dev-archive@www.apache.org Delivered-To: apmail-deltacloud-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 55B30D9A0 for ; Fri, 10 Aug 2012 14:06:23 +0000 (UTC) Received: (qmail 94569 invoked by uid 500); 10 Aug 2012 14:06:23 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 94552 invoked by uid 500); 10 Aug 2012 14:06:23 -0000 Mailing-List: contact dev-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 dev@deltacloud.apache.org Received: (qmail 94544 invoked by uid 99); 10 Aug 2012 14:06:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2012 14:06:23 +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; Fri, 10 Aug 2012 14:06:16 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7AE5sec010658 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 10 Aug 2012 10:05:54 -0400 Received: from [10.36.5.7] (vpn1-5-7.ams2.redhat.com [10.36.5.7]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7AE5qxr017071 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Fri, 10 Aug 2012 10:05:53 -0400 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.0 \(1485\)) Subject: Re: [PATCH] Fixes JIRA DTACLOUD_296 - storage volumes and HTML UI From: Michal Fojtik In-Reply-To: <1344528218-10043-1-git-send-email-marios@redhat.com> Date: Fri, 10 Aug 2012 16:05:55 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: <05783B86-EB14-4DEE-9F58-EBD877C5BDDD@redhat.com> References: <1344528218-10043-1-git-send-email-marios@redhat.com> To: dev@deltacloud.apache.org X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 On Aug 9, 2012, at 6:03 PM, marios@redhat.com wrote: ACK. > From: marios >=20 > https://issues.apache.org/jira/browse/DTACLOUD-296 >=20 > Signed-off-by: marios > --- > server/views/storage_volumes/attach.html.haml | 2 +- > server/views/storage_volumes/show.html.haml | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/server/views/storage_volumes/attach.html.haml = b/server/views/storage_volumes/attach.html.haml > index 0127ccd..8c20753 100644 > --- a/server/views/storage_volumes/attach.html.haml > +++ b/server/views/storage_volumes/attach.html.haml > @@ -1,6 +1,6 @@ > %h1 Attach storage volume >=20 > -%form{ :action =3D> attach_storage_volume_url(params[:id]), :method = =3D> :post } > +%form{ :action =3D> = api_url_for("storage_volumes/#{params[:id]}/attach"), :method =3D> :post = } > %p > %label > Instance ID: > diff --git a/server/views/storage_volumes/show.html.haml = b/server/views/storage_volumes/show.html.haml > index 2ac9944..9a9da37 100644 > --- a/server/views/storage_volumes/show.html.haml > +++ b/server/views/storage_volumes/show.html.haml > @@ -40,4 +40,4 @@ > =3Dlink_to_action "Delete", = api_url_for("storage_volumes/#{@storage_volume.id}"), :delete > =3Dlink_to_action "Attach", = api_url_for("storage_volumes/#{@storage_volume.id}/attach_instance"), = :get > - if @storage_volume.instance_id > - =3Dlink_to_action "Detach", = detach_storage_volume_url(@storage_volume.id), :post > + =3Dlink_to_action "Detach", = api_url_for("storage_volumes/#{@storage_volume.id}/detach"), :post > --=20 > 1.7.6.5 >=20