[PATCH] BZ 844634 add correct hwp info to instance popup
Matt Wagner
matt.wagner at redhat.com
Wed Aug 15 18:26:53 UTC 2012
On Wed, Aug 15, 2012 at 02:19:31PM -0400, Tzu-Mainn Chen wrote:
> ---
> src/app/views/logs/_deployment_popup.html.haml | 2 +-
> src/app/views/logs/_instance_popup.html.haml | 6 +++---
> src/config/locales/en.yml | 1 +
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/src/app/views/logs/_deployment_popup.html.haml b/src/app/views/logs/_deployment_popup.html.haml
> index 14558b8..3d405dc 100644
> --- a/src/app/views/logs/_deployment_popup.html.haml
> +++ b/src/app/views/logs/_deployment_popup.html.haml
> @@ -7,4 +7,4 @@
> %td= ApplicationHelper.count_uptime(deployment.uptime_all)
> %tr
> %td= t('logs.index.frontend_realm')
> - %td= deployment.frontend_realm.nil? ? t('logs.index.not_available') : deployment.frontend_realm.name
> + %td= deployment.frontend_realm.nil? ? t('logs.index.none') : deployment.frontend_realm.name
> diff --git a/src/app/views/logs/_instance_popup.html.haml b/src/app/views/logs/_instance_popup.html.haml
> index 663a3db..87e3e59 100644
> --- a/src/app/views/logs/_instance_popup.html.haml
> +++ b/src/app/views/logs/_instance_popup.html.haml
> @@ -7,10 +7,10 @@
> %td= ApplicationHelper.count_uptime(instance.uptime)
> %tr
> %td= t('logs.index.frontend_realm')
> - %td= instance.frontend_realm.nil? ? t('logs.index.not_available') : instance.frontend_realm.name
> + %td= instance.frontend_realm.nil? ? t('logs.index.none') : instance.frontend_realm.name
> %tr
> %td= t('logs.index.image')
> - %td= instance.image.nil? ? t('logs.index.not_available') : instance.image.name
> + %td= instance.image.nil? ? t('logs.index.none') : instance.image.name
> %tr
> %td= t('logs.index.hwp')
> - %td= instance.instance_hwp.nil? ? t('logs.index.not_available') : instance.instance_hwp.name
> + %td= instance.hardware_profile.nil? ? t('logs.index.none') : instance.hardware_profile.name
> diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
> index 42486d9..88c16e6 100644
> --- a/src/config/locales/en.yml
> +++ b/src/config/locales/en.yml
> @@ -30,6 +30,7 @@ en:
> owner_order: Owner
> index:
> title: Logs
> + none: None
> not_available: N/A
> event_time: Time
> grouped_by: Grouped By
> --
> 1.7.6.5
ACK! This looks good. I will push to master + 1.1 momentarily.
-- Matt
More information about the aeolus-devel
mailing list