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/05/15 17:15:43 UTC
[PATCH core 11/26] Core: Storage volumes should always show the :name attribute
From: Michal Fojtik <mf...@redhat.com>
Signed-off-by: Michal fojtik <mf...@redhat.com>
---
server/views/storage_volumes/show.html.haml | 1 +
server/views/storage_volumes/show.xml.haml | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/views/storage_volumes/show.html.haml b/server/views/storage_volumes/show.html.haml
index aabdd85..1c1f458 100644
--- a/server/views/storage_volumes/show.html.haml
+++ b/server/views/storage_volumes/show.html.haml
@@ -4,6 +4,7 @@
%div{ :'data-role' => :content, :'data-theme' => 'c'}
%ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
%li{ :'data-role' => 'list-divider'} Name
+ %p{ :'data-role' => 'fieldcontain'}=@storage_volume.id
%li
%p{ :'data-role' => 'fieldcontain'}=@storage_volume.id
%li{ :'data-role' => 'list-divider'} Created
diff --git a/server/views/storage_volumes/show.xml.haml b/server/views/storage_volumes/show.xml.haml
index 440609b..f9f5f25 100644
--- a/server/views/storage_volumes/show.xml.haml
+++ b/server/views/storage_volumes/show.xml.haml
@@ -9,9 +9,8 @@
- if @storage_volume.kind
%kind<
= @storage_volume.kind
- - if @storage_volume.name
- %name<
- = @storage_volume.name
+ %name<
+ = @storage_volume.name || @storage_volume.id
- if @storage_volume.device
%device<
= @storage_volume.device
--
1.7.10.1
RE: [PATCH core 11/26] Core: Storage volumes should always show the :name attribute
Posted by "Koper, Dies" <di...@fast.au.fujitsu.com>.
Hi Michal,
This is the commit I was referring to on irc.
The patch description does not match your change in show.html.haml.
If I take the line out, the GUI page looks much better.
Regards,
Dies Koper
> -----Original Message-----
> From: mfojtik@redhat.com [mailto:mfojtik@redhat.com]
> Sent: Wednesday, 16 May 2012 1:16 AM
> To: dev@deltacloud.apache.org
> Subject: [PATCH core 11/26] Core: Storage volumes should always show
> the :name attribute
>
> From: Michal Fojtik <mf...@redhat.com>
>
>
> Signed-off-by: Michal fojtik <mf...@redhat.com>
> ---
> server/views/storage_volumes/show.html.haml | 1 +
> server/views/storage_volumes/show.xml.haml | 5 ++---
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/server/views/storage_volumes/show.html.haml
> b/server/views/storage_volumes/show.html.haml
> index aabdd85..1c1f458 100644
> --- a/server/views/storage_volumes/show.html.haml
> +++ b/server/views/storage_volumes/show.html.haml
> @@ -4,6 +4,7 @@
> %div{ :'data-role' => :content, :'data-theme' => 'c'}
> %ul{ :'data-role' => :listview , :'data-inset' => :true,
:'data-divider-theme'
> => 'd'}
> %li{ :'data-role' => 'list-divider'} Name
> + %p{ :'data-role' => 'fieldcontain'}=@storage_volume.id
> %li
> %p{ :'data-role' => 'fieldcontain'}=@storage_volume.id
> %li{ :'data-role' => 'list-divider'} Created
> diff --git a/server/views/storage_volumes/show.xml.haml
> b/server/views/storage_volumes/show.xml.haml
> index 440609b..f9f5f25 100644
> --- a/server/views/storage_volumes/show.xml.haml
> +++ b/server/views/storage_volumes/show.xml.haml
> @@ -9,9 +9,8 @@
> - if @storage_volume.kind
> %kind<
> = @storage_volume.kind
> - - if @storage_volume.name
> - %name<
> - = @storage_volume.name
> + %name<
> + = @storage_volume.name || @storage_volume.id
> - if @storage_volume.device
> %device<
> = @storage_volume.device
> --
> 1.7.10.1
>