-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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
Add cache busting parameter to media thumbnails and links in Media Library (Lombiq Technologies: OCORE-143) #15276
Conversation
This pull request has merge conflicts. Please resolve those before requesting a review. |
# Conflicts: # src/OrchardCore.Modules/OrchardCore.Media/wwwroot/Scripts/media.js # src/OrchardCore.Modules/OrchardCore.Media/wwwroot/Scripts/media.min.js
src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs
Show resolved
Hide resolved
src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs
Outdated
Show resolved
Hide resolved
src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs
Show resolved
Hide resolved
src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs
Show resolved
Hide resolved
@@ -30,6 +32,8 @@ public class AdminController : Controller | |||
private readonly MediaOptions _mediaOptions; | |||
private readonly IUserAssetFolderNameProvider _userAssetFolderNameProvider; | |||
private readonly IChunkFileUploadService _chunkFileUploadService; | |||
private readonly IFileVersionProvider _fileVersionProvider; | |||
private readonly IServiceProvider _serviceProvider; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
private readonly IServiceProvider _serviceProvider; | |
private readonly IMediaFileStoreCache _mediaFileStoreCache; |
) | ||
IChunkFileUploadService chunkFileUploadService, | ||
IFileVersionProvider fileVersionProvider, | ||
IServiceProvider serviceProvider) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IServiceProvider serviceProvider) | |
IMediaFileStoreCache mediaFileStoreCache) |
@@ -52,6 +57,8 @@ IChunkFileUploadService chunkFileUploadService | |||
S = stringLocalizer; | |||
_userAssetFolderNameProvider = userAssetFolderNameProvider; | |||
_chunkFileUploadService = chunkFileUploadService; | |||
_fileVersionProvider = fileVersionProvider; | |||
_serviceProvider = serviceProvider; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
_serviceProvider = serviceProvider; | |
_mediaFileStoreCache = mediaFileStoreCache; |
var mediaFileStoreCache = _serviceProvider.GetService<IMediaFileStoreCache>(); | ||
if (mediaFileStoreCache == null) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
var mediaFileStoreCache = _serviceProvider.GetService<IMediaFileStoreCache>(); | |
if (mediaFileStoreCache == null) | |
if (_mediaFileStoreCache == null) |
src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs
Outdated
Show resolved
Hide resolved
Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
…brary (OrchardCMS#15276) Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Fixes #15273.
Fixes #3925.