From 8f6de1f59e9aa8207e58e43b862c6d252f5341d3 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Wed, 16 Jan 2019 18:37:38 +0100
Subject: Fix for UploadInput with empty or multiple value.

---
 .../src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kvision-modules/kvision-upload')

diff --git a/kvision-modules/kvision-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt b/kvision-modules/kvision-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt
index da35f9ef..2af7b3f7 100644
--- a/kvision-modules/kvision-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt
+++ b/kvision-modules/kvision-upload/src/main/kotlin/pl/treksoft/kvision/form/upload/UploadInput.kt
@@ -254,11 +254,11 @@ open class UploadInput(uploadUrl: String? = null, multiple: Boolean = false, cla
 
     private fun getFiles(): List<KFile> {
         nativeFiles.clear()
-        return (getElementJQueryD()?.fileinput("getFileStack") as Array<File>).toList().map {
+        return (getElementJQueryD()?.fileinput("getFileStack") as? Array<File>)?.toList()?.map {
             val kFile = KFile(it.name, it.size, null)
             nativeFiles[kFile] = it
             kFile
-        }
+        } ?: listOf()
     }
 
     /**
@@ -266,7 +266,7 @@ open class UploadInput(uploadUrl: String? = null, multiple: Boolean = false, cla
      * @return value as a String
      */
     fun getValueAsString(): String? {
-        return value?.joinToString { it.name }
+        return value?.joinToString(",") { it.name }
     }
 
     /**
-- 
cgit