[Kimchi-devel] [PATCH 2/2] Remove cdrom '.iso' suffix checking from add template js

[Sheldon]

Reviewed-by: ShaoHe Feng <shaohef at linux.vnet.ibm.com>


On 05/29/2014 03:09 AM, Rodrigo Trujillo wrote:
> This patch removes the '.iso' checking of the path of a given cdrom
> image, when create a new template.
>
> Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo at linux.vnet.ibm.com>
> ---
>   ui/js/src/kimchi.template_add_main.js | 13 +------------
>   1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js
> index dbb3952..2bf48a4 100644
> --- a/ui/js/src/kimchi.template_add_main.js
> +++ b/ui/js/src/kimchi.template_add_main.js
> @@ -210,10 +210,6 @@ kimchi.template_add_main = function() {
>
>       $('#btn-template-file-create').click(function() {
>           var isoFile = $('#iso-file').val();
> -        if (!kimchi.is_iso_file(isoFile)) {
> -            kimchi.message.error.code('KCHTMPL6002E');
> -            return;
> -        }
>           if (!kimchi.template_check_path(isoFile)) {
>               kimchi.message.error.code('KCHAPI6003E');
>               return;
> @@ -408,16 +404,9 @@ kimchi.template_check_url = function(url) {
>   };
>
>   kimchi.template_check_path = function(filePath) {
> -    var reg = /((\/([0-9a-zA-Z-_ \.]+))+[\.]iso)$/;
> +    var reg = /((\/([0-9a-zA-Z-_ \.]+))+)$/;
>       if (filePath.constructor === String) {
>           return reg.test(filePath);
>       }
>       return false;
>   };
> -
> -kimchi.is_iso_file = function(isoFile) {
> -    if (/.iso$/.test(isoFile)) {
> -        return true;
> -    }
> -    return false;
> -};


-- 
Thanks and best regards!

Sheldon Feng(冯少合)<shaohef at linux.vnet.ibm.com>
IBM Linux Technology Center