Skip to content
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

Merged
merged 10 commits into from
Mar 1, 2024

Conversation

Piedone
Copy link
Member

@Piedone Piedone commented Feb 7, 2024

Fixes #15273.
Fixes #3925.

Copy link
Contributor

github-actions bot commented Feb 9, 2024

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
@@ -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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private readonly IServiceProvider _serviceProvider;
private readonly IMediaFileStoreCache _mediaFileStoreCache;

)
IChunkFileUploadService chunkFileUploadService,
IFileVersionProvider fileVersionProvider,
IServiceProvider serviceProvider)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
IServiceProvider serviceProvider)
IMediaFileStoreCache mediaFileStoreCache)

@@ -52,6 +57,8 @@ IChunkFileUploadService chunkFileUploadService
S = stringLocalizer;
_userAssetFolderNameProvider = userAssetFolderNameProvider;
_chunkFileUploadService = chunkFileUploadService;
_fileVersionProvider = fileVersionProvider;
_serviceProvider = serviceProvider;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_serviceProvider = serviceProvider;
_mediaFileStoreCache = mediaFileStoreCache;

Comment on lines +519 to +520
var mediaFileStoreCache = _serviceProvider.GetService<IMediaFileStoreCache>();
if (mediaFileStoreCache == null)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var mediaFileStoreCache = _serviceProvider.GetService<IMediaFileStoreCache>();
if (mediaFileStoreCache == null)
if (_mediaFileStoreCache == null)

@Piedone Piedone merged commit ecd563c into OrchardCMS:main Mar 1, 2024
4 checks passed
urbanit pushed a commit to urbanit/OrchardCore that referenced this pull request Mar 18, 2024
…brary (OrchardCMS#15276)

Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add cache busting parameter to media thumbnails and links in Media Library Media Thumbnails Cache Busting
3 participants