Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into integratedFileEditor

Browse Source 
# Conflicts:
#	Client/Browser_Tools/BrowserJSObject.cs
#	Step/Controllers/WebApi/NcFileController.cs
This commit is contained in:
Lucio Maranta
2019-07-09 11:07:32 +02:00
parent 9335942679 4624c47f32
commit bb35d1cbc1
166 changed files with 5447 additions and 2182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/Controllers/WebApi/NcFileController.cs
+5 -4
View File
@@ -119,18 +119,19 @@ namespace Step.Controllers.WebApi
return BadRequest(cmsError.localizationKey);
}
foreach (FormItem item in formItems)
ActiveProgramDataModel programData = new ActiveProgramDataModel();
foreach (FormItem item in formItems)
{
if (item.IsAFile)
{
if (item.ParameterName == "main")
if (item.ParameterName == "main")
{
File.WriteAllBytes(TEMP_PP_FOLDER + item.FileName, item.Data);
mainPPName = item.FileName;
programs.Add(item.FileName);
// Upload main program
CmsError cmsError = ncFileHandler.UploadPartProgramAndActivate(TEMP_PP_FOLDER, item.FileName, out ActiveProgramDataModel programData);
CmsError cmsError = ncFileHandler.UploadPartProgramAndActivate(TEMP_PP_FOLDER, item.FileName, out programData);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
}
@@ -147,7 +148,7 @@ namespace Step.Controllers.WebApi
else if (item.ParameterName == "image")
{
// Upload image
File.WriteAllBytes(PART_PRG_IMAGES + item.FileName, item.Data);
File.WriteAllBytes(PART_PRG_IMAGES + Path.GetFileNameWithoutExtension(programData.Path) + Path.GetExtension(item.FileName), item.Data);
imageUploaded = true;
}
}