fix module id upload folder

Sacha Trauwaen · Sacha Trauwaen · commit 618976238a05 · 2023-03-17T16:51:10.000+01:00
diff --git a/OpenContent/Components/FileUploadController.cs b/OpenContent/Components/FileUploadController.cs
@@ -194,7 +194,8 @@ private void UploadWholeFile(HttpContextBase context, ICollection<FilesStatus> s
                     if (!string.IsNullOrEmpty(context.Request.Form["hidden"]) && // cropped file
                         context.Request.Form["hidden"] == "true")
                     {
-                        uploadfolder = "OpenContent/" + (secure ? "Secure" : "") + "Cropped/" + ActiveModule.ModuleID;
+                        //uploadfolder = "OpenContent/" + (secure ? "Secure" : "") + "Cropped/" + ActiveModule.ModuleID;
+                        uploadfolder = "OpenContent/" + (secure ? "Secure" : "") + "Cropped/" + module.DataModule.ModuleId;
                         GetOrCreateFolder(secure, uploadfolder);
                         if (!string.IsNullOrEmpty(context.Request.Form["itemKey"]))
                         {
@@ -237,7 +238,7 @@ private void UploadWholeFile(HttpContextBase context, ICollection<FilesStatus> s
                     {
                         string uploadParentFolder = "OpenContent/" + (secure ? "Secure" : "") + "Files/";
                         GetOrCreateFolder(secure, uploadParentFolder);
-                        uploadfolder = uploadParentFolder + ActiveModule.ModuleID + "/";
+                        uploadfolder = uploadParentFolder + module.DataModule.ModuleId + "/";
                         if (module.Settings.Manifest.DeleteFiles)
                         {
                             if (!string.IsNullOrEmpty(context.Request.Form["itemKey"]))

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,8 @@ private void UploadWholeFile(HttpContextBase context, ICollection<FilesStatus> s`
`194`	`194`	`if (!string.IsNullOrEmpty(context.Request.Form["hidden"]) && // cropped file`
`195`	`195`	`context.Request.Form["hidden"] == "true")`
`196`	`196`	`{`
`197`		`- uploadfolder = "OpenContent/" + (secure ? "Secure" : "") + "Cropped/" + ActiveModule.ModuleID;`
	`197`	`+ //uploadfolder = "OpenContent/" + (secure ? "Secure" : "") + "Cropped/" + ActiveModule.ModuleID;`
	`198`	`+ uploadfolder = "OpenContent/" + (secure ? "Secure" : "") + "Cropped/" + module.DataModule.ModuleId;`
`198`	`199`	`GetOrCreateFolder(secure, uploadfolder);`
`199`	`200`	`if (!string.IsNullOrEmpty(context.Request.Form["itemKey"]))`
`200`	`201`	`{`
`@@ -237,7 +238,7 @@ private void UploadWholeFile(HttpContextBase context, ICollection<FilesStatus> s`
`237`	`238`	`{`
`238`	`239`	`string uploadParentFolder = "OpenContent/" + (secure ? "Secure" : "") + "Files/";`
`239`	`240`	`GetOrCreateFolder(secure, uploadParentFolder);`
`240`		`- uploadfolder = uploadParentFolder + ActiveModule.ModuleID + "/";`
	`241`	`+ uploadfolder = uploadParentFolder + module.DataModule.ModuleId + "/";`
`241`	`242`	`if (module.Settings.Manifest.DeleteFiles)`
`242`	`243`	`{`
`243`	`244`	`if (!string.IsNullOrEmpty(context.Request.Form["itemKey"]))`