validation for file type selection

Issue-ID: VNFSDK-243

Change-Id: Ib831eb9733a51408c73363702dd7032502f24710
Signed-off-by: Anjali Walsatwar <anjali.walsatwar@huawei.com>

diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/directives/fileupload/fileuploadDirective.js b/vnfmarket/src/main/webapp/vnfmarket/common/directives/fileupload/fileuploadDirective.js
index 3f64841..43137a5 100644 (file)
--- a/vnfmarket/src/main/webapp/vnfmarket/common/directives/fileupload/fileuploadDirective.js
+++ b/vnfmarket/src/main/webapp/vnfmarket/common/directives/fileupload/fileuploadDirective.js
@@ -43,7 +43,15 @@
         function link(scope, element, attrs) {
             element.bind("change", function (changeEvent) {
                 scope.$apply(function () {
-                    scope.fileUpload = changeEvent.target.files[0];
+                    var fileType = changeEvent.target.accept;
+                    var ext = "." + changeEvent.target.value.match(/\.(.+)$/)[1];
+                    scope.fileUpload = null;
+                    if (typeof fileType == undefined || fileType == "") {
+                        scope.fileUpload = changeEvent.target.files[0];
+                    }
+                    else if ((Array.isArray(fileType) && fileType.indexOf(ext) > -1) || (fileType == ext)) {
+                        scope.fileUpload = changeEvent.target.files[0];
+                    }
                 });
             });
         }

diff --git a/vnfmarket/src/main/webapp/vnfmarket/common/locale/locale-en.json b/vnfmarket/src/main/webapp/vnfmarket/common/locale/locale-en.json
index d086b9a..f82b567 100644 (file)
--- a/vnfmarket/src/main/webapp/vnfmarket/common/locale/locale-en.json
+++ b/vnfmarket/src/main/webapp/vnfmarket/common/locale/locale-en.json
@@ -57,7 +57,7 @@
                                "fields": {\r
                                        "fileUpload": {\r
                                                "label": "Select File",\r
-                                               "noFileSelected": "No file selected"\r
+                                               "noFileSelected": "No file selected (Select .csar file)"\r
                                        },\r
                                        "shortDescription": {\r
                                                "placeholder": "Short Description"\r