From lvroyce at linux.vnet.ibm.com Wed Jul 30 04:10:16 2014
Content-Type: multipart/mixed; boundary="===============5786174093545820843=="
MIME-Version: 1.0
From: Royce Lv <lvroyce at linux.vnet.ibm.com>
To: kimchi-devel at ovirt.org
Subject: Re: [Kimchi-devel] [PATCH] Bugfix Issue#398 UI: Add information when
 no cdrom exists
Date: Wed, 30 Jul 2014 16:10:06 +0800
Message-ID: <53D8A85E.70302@linux.vnet.ibm.com>
In-Reply-To: 1406532118-11802-1-git-send-email-wenwang@linux.vnet.ibm.com

--===============5786174093545820843==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

I have to say I changed my mind on display warning about no cdrom exist:)
Will it be better if we disable or hide 'manage media' when no cdrom =

device present?

On 2014=E5=B9=B407=E6=9C=8828=E6=97=A5 15:21, wenwang(a)linux.vnet.ibm.com =
wrote:
> From: Wen Wang <wenwang(a)linux.vnet.ibm.com>
>
> Add one line "No CDROM found" under "Manage Media" diaguage when there
> is no CDROM found for an VM.
>
> Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com>
> ---
>   ui/js/src/kimchi.guest_media_main.js |   15 ++++++++++-----
>   ui/pages/guest-media.html.tmpl       |    5 +++++
>   2 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/ui/js/src/kimchi.guest_media_main.js b/ui/js/src/kimchi.gues=
t_media_main.js
> index d6dee2e..60d12ba 100644
> --- a/ui/js/src/kimchi.guest_media_main.js
> +++ b/ui/js/src/kimchi.guest_media_main.js
> @@ -23,14 +23,19 @@ kimchi.guest_media_main =3D function() {
>               storageType: 'cdrom'
>           }, function(storages) {
>               var rowHTML =3D $('#cdrom-row-tmpl').html();
> +            var noCDROMHTML =3D $('#empty-cdrom-tmpl').html();
>               var container =3D $('#guest-edit-cdrom-row-container');
>               $(container).empty();
>
> -            $.each(storages, function(index, storage) {
> -                storage['vm'] =3D kimchi.selectedGuest;
> -                var templated =3D kimchi.substitute(rowHTML, storage);
> -                container.append(templated);
> -            });
> +            if(storages.length > 0) {
> +                $.each(storages, function(index, storage) {
> +                    storage['vm'] =3D kimchi.selectedGuest;
> +                    var templated =3D kimchi.substitute(rowHTML, storage=
);
> +                    container.append(templated);
> +                });
> +            } else {
> +                container.append(noCDROMHTML);
> +            }
>
>               var replaceCDROM =3D function(event) {
>                   event.preventDefault();
> diff --git a/ui/pages/guest-media.html.tmpl b/ui/pages/guest-media.html.t=
mpl
> index 83ad6ab..fe2e8ef 100644
> --- a/ui/pages/guest-media.html.tmpl
> +++ b/ui/pages/guest-media.html.tmpl
> @@ -51,6 +51,11 @@
>           </div>
>       </div>
>   </script>
> +<script id=3D"empty-cdrom-tmpl" type=3D"text/html">
> +    <div>
> +        $_("No CDROM found.")
> +    </div>
> +</script>
>
>   <script type=3D"text/javascript">
>       kimchi.guest_media_main();


--===============5786174093545820843==--