Skip to content

TD-5836-Article attachment filesize incorrect -ResourseDeatilsPage #1337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Release v2.6.1 ivory
merged 3 commits into from
Aug 20, 2025
Merged

TD-5836-Article attachment filesize incorrect -ResourseDeatilsPage #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e403b98
TD-5892: bug fix
swapnamol-abraham Aug 8, 2025
aa1edca
Merge pull request #1313 from TechnologyEnhancedLearning/Develop/Fixe…
swapnamol-abraham Aug 8, 2025
9a1232b
Defect/Td-5836
AnjuJose011 Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion LearningHub.Nhs.WebUI/Controllers/ContributeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,9 @@ public async Task<FileUploadResult> UploadArticleFile(IFormCollection inputForm)
var file = inputForm.Files[0];
int.TryParse(inputForm["resourceVersionId"], out int resourceVersionId);
int.TryParse(inputForm["changeingFileId"], out int existingFileId);
int.TryParse(inputForm["fileSize"], out int fileSize);
var currentUserId = this.User.Identity.GetCurrentUserId();
return await this.contributeService.ProcessArticleFileAsync(resourceVersionId, file, existingFileId, currentUserId);
return await this.contributeService.ProcessArticleFileAsync(resourceVersionId, file, fileSize, existingFileId, currentUserId);
}

/// <summary>
Expand Down
3 changes: 2 additions & 1 deletion LearningHub.Nhs.WebUI/Interfaces/IContributeService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@ public interface IContributeService
/// </summary>
/// <param name="resourceVersionId">Resource version id.</param>
/// <param name="file">File.</param>
/// <param name="fileSize">fileSize.</param>
/// <param name="changeingFileId">Changing file id.</param>
/// <param name="currentUserId">Current user id.</param>
/// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionId, IFormFile file, int changeingFileId, int currentUserId);
Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionId, IFormFile file, int fileSize,int changeingFileId, int currentUserId);

/// <summary>
/// The ProcessResourceAttachedFileAsync.
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
</div>
</div>

<catalogue-select v-if="resourceCatalogueCount>1 && showCatalogueSelect" v-model.number="resourceCatalogueId" @input="catalogueSelected"></catalogue-select>
<catalogue-select v-if="resourceCatalogueCount>0 && showCatalogueSelect" v-model.number="resourceCatalogueId" @input="catalogueSelected"></catalogue-select>
</div>
</template>

Expand Down
7 changes: 4 additions & 3 deletions LearningHub.Nhs.WebUI/Services/ContributeService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,11 @@ public async Task<FileChunkDetailViewModel> GetFileChunkDetail(int fileChunkDeta
/// </summary>
/// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
/// <param name="file">The file<see cref="IFormFile"/>.</param>
/// <param name="fileSize">The fileSize<see cref="int"/>.</param>
/// <param name="existingFileId">The existingFileId<see cref="int"/>.</param>
/// <param name="currentUserId">The currentUserId<see cref="int"/>.</param>
/// <returns>The <see cref="Task{FileUploadResult}"/>.</returns>
public async Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionId, IFormFile file, int existingFileId, int currentUserId)
public async Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionId, IFormFile file, int fileSize, int existingFileId, int currentUserId)
{
var filelocation = string.Empty;
string extension = Path.GetExtension(file.FileName).Replace(".", string.Empty);
Expand Down Expand Up @@ -415,7 +416,7 @@ public async Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionI
FileTypeId = fileType == null ? 0 : fileType.Id,
FileName = file.FileName,
FilePath = filelocation,
FileSize = (int)(file.Length / 1000),
FileSize = (int)(fileSize / 1000),
ReplacedFileId = existingFileId,
});

Expand All @@ -425,7 +426,7 @@ public async Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionI
ResourceVersionId = resourceVersionId,
FileName = file.FileName,
FileTypeId = fileType == null ? 0 : fileType.Id,
FileSizeKb = (int)(file.Length / 1000),
FileSizeKb = (int)(fileSize / 1000),
Invalid = false,
};
}
Expand Down
Loading