aboutsummaryrefslogtreecommitdiff
path: root/backend/api
diff options
context:
space:
mode:
authorSonja Galovic <galovicsonja@gmail.com>2022-04-07 00:02:38 +0200
committerSonja Galovic <galovicsonja@gmail.com>2022-04-07 00:02:38 +0200
commitba4eba6116cba39fab60a7ade8cb9f436dee0bca (patch)
tree14b64dfeb9c0eb5d207fa41425daf48784976dc7 /backend/api
parent2ecc1783044113db6f2114f0f1a11094362ea1d0 (diff)
parentf1b6fb5fd30bf088b787abbfe9d72e559f734e71 (diff)
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
Diffstat (limited to 'backend/api')
-rw-r--r--backend/api/api/Controllers/FileController.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/api/api/Controllers/FileController.cs b/backend/api/api/Controllers/FileController.cs
index 27bd75fb..ac17ab0b 100644
--- a/backend/api/api/Controllers/FileController.cs
+++ b/backend/api/api/Controllers/FileController.cs
@@ -12,7 +12,7 @@ namespace api.Controllers
[ApiController]
public class FileController : ControllerBase
{
- private string[] permittedExtensions = { ".csv" };
+ private string[] permittedExtensions = { ".csv",".json",".xls",".xlsx" };
private string[] permittedExtensionsH5 = { ".h5" };//niz da bi dodali h4 itd
private readonly IConfiguration _configuration;
private IJwtToken _token;
@@ -186,7 +186,7 @@ namespace api.Controllers
await file.CopyToAsync(stream);
}
FileModel fileModel= new FileModel();
- fileModel.type = "csv";
+ fileModel.type = ext;
fileModel.path=fullPath;
fileModel.uploaderId= uploaderId;
fileModel.date = DateTime.Now.ToUniversalTime();