Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Extend picture entity - add new field Style, Extra Field, related issue #201

KrzysztofPajakb6e189df776d
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
index d48738a43..2560e9af0 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
@@ -20,7 +20,8 @@ namespace Grand.Api.Commands.Models.Catalog
return false;
await _pictureService.UpdatePicture(picture.Id, request.Model.PictureBinary,
- request.Model.MimeType, request.Model.SeoFilename, request.Model.AltAttribute, request.Model.TitleAttribute);
+ request.Model.MimeType, request.Model.SeoFilename, request.Model.AltAttribute, request.Model.TitleAttribute,
+ request.Model.Style, request.Model.ExtraField);
return true;
}
diff --git a/src/API/Grand.Api/DTOs/Common/PictureDto.cs b/src/API/Grand.Api/DTOs/Common/PictureDto.cs
index 53867c2bf..0e0f93902 100644
--- a/src/API/Grand.Api/DTOs/Common/PictureDto.cs
+++ b/src/API/Grand.Api/DTOs/Common/PictureDto.cs
@@ -12,6 +12,8 @@ namespace Grand.Api.DTOs.Common
public string TitleAttribute { get; set; }
public Reference Reference { get; set; }
public string ObjectId { get; set; }
+ public string Style { get; set; }
+ public string ExtraField { get; set; }
public bool IsNew { get; set; }
}
}
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs b/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
index 487b1b260..3cff5ef0a 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
+++ b/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
@@ -141,11 +141,14 @@ namespace Grand.Business.Storage.Interfaces
/// <param name="seoFilename">The SEO filename</param>
/// <param name="altAttribute">"alt" attribute for "img" HTML element</param>
/// <param name="titleAttribute">"title" attribute for "img" HTML element</param>
+ /// <param name="style">style attribute for "img" HTML element</param>
+ /// <param name="extrafield">Extra field</param>
/// <param name="isNew">A value indicating whether the picture is new</param>
/// <param name="validateBinary">A value indicating whether to validated provided picture binary</param>
/// <returns>Picture</returns>
Task<Picture> UpdatePicture(string pictureId, byte[] pictureBinary, string mimeType,
string seoFilename, string altAttribute = null, string titleAttribute = null,
+ string style = null, string extrafield = null,
bool isNew = true, bool validateBinary = true);
/// <summary>
diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.cs
index e58eae686..0ac243691 100644
--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs
@@ -349,14 +349,8 @@ namespace Grand.Business.Storage.Services
{
await DeletePictureThumbs(picture);
- picture = await UpdatePicture(picture.Id,
- null,
- picture.MimeType,
- picture.SeoFilename,
- picture.AltAttribute,
- picture.TitleAttribute,
- false,
- false);
+ picture.IsNew = false;
+ await _pictureRepository.UpdateField(picture.Id, x => x.IsNew, picture.IsNew);
}
var seoFileName = picture.SeoFilename;
@@ -460,7 +454,9 @@ namespace Grand.Business.Storage.Services
TitleAttribute = p.TitleAttribute,
Reference = p.Reference,
ObjectId = p.ObjectId,
- Locales = p.Locales
+ Locales = p.Locales,
+ Style = p.Style,
+ ExtraField = p.ExtraField
});
return await Task.FromResult(query.FirstOrDefault());
});
@@ -600,11 +596,14 @@ namespace Grand.Business.Storage.Services
/// <param name="seoFilename">The SEO filename</param>
/// <param name="altAttribute">"alt" attribute for "img" HTML element</param>
/// <param name="titleAttribute">"title" attribute for "img" HTML element</param>
+ /// <param name="style">style attribute for "img" HTML element</param>
+ /// <param name="extrafield">Extra field</param>
/// <param name="isNew">A value indicating whether the picture is new</param>
/// <param name="validateBinary">A value indicating whether to validated provided picture binary</param>
/// <returns>Picture</returns>
public virtual async Task<Picture> UpdatePicture(string pictureId, byte[] pictureBinary, string mimeType,
string seoFilename, string altAttribute = null, string titleAttribute = null,
+ string style = null, string extrafield = null,
bool isNew = true, bool validateBinary = true)
{
mimeType = CommonHelper.EnsureNotNull(mimeType);
@@ -641,6 +640,12 @@ namespace Grand.Business.Storage.Services
picture.TitleAttribute = titleAttribute;
await _pictureRepository.UpdateField(picture.Id, x => x.TitleAttribute, picture.TitleAttribute);
+ picture.Style = style;
+ await _pictureRepository.UpdateField(picture.Id, x => x.Style, picture.Style);
+
+ picture.ExtraField = extrafield;
+ await _pictureRepository.UpdateField(picture.Id, x => x.ExtraField, picture.ExtraField);
+
picture.IsNew = isNew;
await _pictureRepository.UpdateField(picture.Id, x => x.IsNew, picture.IsNew);
diff --git a/src/Core/Grand.Domain/Media/Picture.cs b/src/Core/Grand.Domain/Media/Picture.cs
index be67bde1c..019f48098 100644
--- a/src/Core/Grand.Domain/Media/Picture.cs
+++ b/src/Core/Grand.Domain/Media/Picture.cs
@@ -46,7 +46,17 @@ namespace Grand.Domain.Media
/// <summary>
/// Gets or sets the "title" attribute for "img" HTML element. If empty, then a default rule will be used (e.g. product name)
/// </summary>
- public string TitleAttribute { get; set; }
+ public string TitleAttribute { get; set; }
+
+ /// <summary>
+ /// Gets or sets the "Style" attribute for "img" HTML element.
+ /// </summary>
+ public string Style { get; set; }
+
+ /// <summary>
+ /// Gets or sets the "extra field"
+ /// </summary>
+ public string ExtraField { get; set; }
/// <summary>
/// Gets or sets a value indicating whether the picture is new
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
index 454803084..bf740cc50 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
@@ -79,6 +79,20 @@
<span asp-validation-for="DisplayOrder"></span>
</div>
</div>
+ <div class="form-group">
+ <admin-label asp-for="Style" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Style" />
+ <span asp-validation-for="Style"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="ExtraField" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="ExtraField" />
+ <span asp-validation-for="ExtraField"></span>
+ </div>
+ </div>
<div class="form-group">
<div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">
<button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml
index 715327743..7806930c8 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/PicturePopup.cshtml
@@ -64,6 +64,20 @@
</div>
</div>
</localized-editor>
+ <div class="form-group">
+ <admin-label asp-for="Style" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="Style" />
+ <span asp-validation-for="Style"></span>
+ </div>
+ </div>
+ <div class="form-group">
+ <admin-label asp-for="ExtraField" />
+ <div class="col-md-9 col-sm-9">
+ <admin-input asp-for="ExtraField" />
+ <span asp-validation-for="ExtraField"></span>
+ </div>
+ </div>
<div class="form-group">
<div class="offset-sm-3 offset-md-3 col-md-9 col-sm-9">
<button class="btn btn-success" type="submit" name="save"><i class="fa fa-check"></i> @Loc["Admin.Common.Save"] </button>
diff --git a/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
index 0183be7bc..6a9cd3ceb 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
@@ -154,7 +154,8 @@ namespace Grand.Web.Admin.Controllers
{
using var image = SKBitmap.Decode(picture.PictureBinary);
SKData d = SKImage.FromBitmap(image).Encode(SKEncodedImageFormat.Webp, mediaSettings.ImageQuality);
- await pictureService.UpdatePicture(picture.Id, d.ToArray(), "image/webp", picture.SeoFilename, picture.AltAttribute, picture.TitleAttribute, true, false);
+ await pictureService.UpdatePicture(picture.Id, d.ToArray(), "image/webp", picture.SeoFilename, picture.AltAttribute, picture.TitleAttribute,
+ picture.Style, picture.ExtraField, true, false);
numberOfConvertItems += 1;
}
catch (Exception ex)
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
index 5ca6793f6..0a9db90f1 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
@@ -517,6 +517,12 @@ namespace Grand.Web.Admin.Models.Catalog
[GrandResourceDisplayName("Admin.Catalog.Products.Pictures.Fields.OverrideTitleAttribute")]
public string TitleAttribute { get; set; }
+ [GrandResourceDisplayName("Admin.Catalog.Products.Pictures.Fields.Style")]
+ public string Style { get; set; }
+
+ [GrandResourceDisplayName("Admin.Catalog.Products.Pictures.Fields.ExtraField")]
+ public string ExtraField { get; set; }
+
public IList<ProductPictureLocalizedModel> Locales { get; set; }
public partial class ProductPictureLocalizedModel : ILocalizedModelLocal
diff --git a/src/Web/Grand.Web.Admin/Models/Common/PictureModel.cs b/src/Web/Grand.Web.Admin/Models/Common/PictureModel.cs
index 643960891..5aa9ea08d 100644
--- a/src/Web/Grand.Web.Admin/Models/Common/PictureModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Common/PictureModel.cs
@@ -21,6 +21,13 @@ namespace Grand.Web.Admin.Models.Common
[GrandResourceDisplayName("Admin.Catalog.Picture.Fields.TitleAttribute")]
public string TitleAttribute { get; set; }
+
+ [GrandResourceDisplayName("Admin.Catalog.Picture.Fields.Style")]
+ public string Style { get; set; }
+
+ [GrandResourceDisplayName("Admin.Catalog.Picture.Fields.ExtraField")]
+ public string ExtraField { get; set; }
+
public IList<PictureLocalizedModel> Locales { get; set; }
public partial class PictureLocalizedModel : ILocalizedModelLocal
diff --git a/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs b/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs
index 72bad078b..8957472ec 100644
--- a/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs
@@ -36,14 +36,17 @@ namespace Grand.Web.Admin.Services
PictureUrl = picture != null ? await _pictureService.GetPictureUrl(picture) : null,
AltAttribute = picture?.AltAttribute,
TitleAttribute = picture?.TitleAttribute,
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
foreach (var language in await _languageService.GetAllLanguages(true))
{
- var locale = new PictureModel.PictureLocalizedModel();
- locale.LanguageId = language.Id;
- locale.AltAttribute = picture.GetTranslation(x => x.AltAttribute, language.Id, false);
- locale.TitleAttribute = picture.GetTranslation(x => x.TitleAttribute, language.Id, false);
+ var locale = new PictureModel.PictureLocalizedModel {
+ LanguageId = language.Id,
+ AltAttribute = picture.GetTranslation(x => x.AltAttribute, language.Id, false),
+ TitleAttribute = picture.GetTranslation(x => x.TitleAttribute, language.Id, false)
+ };
model.Locales.Add(locale);
}
@@ -63,6 +66,8 @@ namespace Grand.Web.Admin.Services
await _pictureService.UpdatePictureField(picture, x => x.AltAttribute, model.AltAttribute);
await _pictureService.UpdatePictureField(picture, x => x.TitleAttribute, model.TitleAttribute);
await _pictureService.UpdatePictureField(picture, x => x.Locales, model.Locales.ToTranslationProperty());
+ await _pictureService.UpdatePictureField(picture, x => x.Style, model.Style);
+ await _pictureService.UpdatePictureField(picture, x => x.ExtraField, model.ExtraField);
}
}
}
diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
index cf15d07dc..128457a1a 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
@@ -2697,7 +2697,9 @@ namespace Grand.Web.Admin.Services
PictureUrl = picture != null ? await _pictureService.GetPictureUrl(picture) : null,
AltAttribute = picture?.AltAttribute,
TitleAttribute = picture?.TitleAttribute,
- DisplayOrder = x.DisplayOrder
+ DisplayOrder = x.DisplayOrder,
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
items.Add(m);
}
@@ -2715,6 +2717,8 @@ namespace Grand.Web.Admin.Services
AltAttribute = picture?.AltAttribute,
TitleAttribute = picture?.TitleAttribute,
DisplayOrder = productPicture.DisplayOrder,
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
return (model, picture);
@@ -2763,6 +2767,8 @@ namespace Grand.Web.Admin.Services
await _pictureService.UpdatePictureField(picture, x => x.AltAttribute, model.AltAttribute);
await _pictureService.UpdatePictureField(picture, x => x.TitleAttribute, model.TitleAttribute);
await _pictureService.UpdatePictureField(picture, x => x.Locales, model.Locales.ToTranslationProperty());
+ await _pictureService.UpdatePictureField(picture, x => x.Style, model.Style);
+ await _pictureService.UpdatePictureField(picture, x => x.ExtraField, model.ExtraField);
}
public virtual async Task DeleteProductPicture(ProductModel.ProductPictureModel model)
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index 621e1f699..e8790e7fe 100644
--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -2544,6 +2544,12 @@
<Resource Name="Admin.Catalog.Picture.Fields.AltAttribute">
<Value>Picture alternate text</Value>
</Resource>
+ <Resource Name="Admin.Catalog.Picture.Fields.ExtraField">
+ <Value>Extra field</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Picture.Fields.Style">
+ <Value>Style</Value>
+ </Resource>
<Resource Name="Admin.Catalog.Picture.Fields.TitleAttribute">
<Value>Picture title</Value>
</Resource>
@@ -3399,6 +3405,9 @@
<Resource Name="Admin.Catalog.Products.Pictures.Fields.DisplayOrder">
<Value>Display order</Value>
</Resource>
+ <Resource Name="Admin.Catalog.Products.Pictures.Fields.ExtraField">
+ <Value>Extra field</Value>
+ </Resource>
<Resource Name="Admin.Catalog.Products.Pictures.Fields.OverrideAltAttribute">
<Value>Alt</Value>
</Resource>
@@ -3408,6 +3417,12 @@
<Resource Name="Admin.Catalog.Products.Pictures.Fields.Picture">
<Value>Picture</Value>
</Resource>
+ <Resource Name="Admin.Catalog.Products.Pictures.Fields.Style">
+ <Value>Style</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Products.Pictures.Fields.ExtraField">
+ <Value>Extra field</Value>
+ </Resource>
<Resource Name="Admin.Catalog.Products.Pictures.SaveBeforeEdit">
<Value>You need to save the product before you can upload pictures for this product page.</Value>
</Resource>
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
index b49c9f1be..db89236c4 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
@@ -95,7 +95,9 @@ namespace Grand.Web.Features.Handlers.Blogs
{
Id = blogPost.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(blogPost.PictureId),
- ImageUrl = await _pictureService.GetPictureUrl(blogPost.PictureId, _mediaSettings.BlogThumbPictureSize)
+ ImageUrl = await _pictureService.GetPictureUrl(blogPost.PictureId, _mediaSettings.BlogThumbPictureSize),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
pictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id))) ?
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
index 6491558a9..7d0a002bf 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
@@ -127,6 +127,8 @@ namespace Grand.Web.Features.Handlers.Blogs
Id = blogPost.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(blogPost.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(blogPost.PictureId, _mediaSettings.BlogThumbPictureSize),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
index 256589e67..9fd26a396 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
@@ -81,7 +81,9 @@ namespace Grand.Web.Features.Handlers.Blogs
FullSizeImageUrl = await _pictureService.GetPictureUrl(post.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(post.PictureId, _mediaSettings.BlogThumbPictureSize),
Title = string.Format(_translationService.GetResource("Media.Blog.ImageLinkTitleFormat"), post.Title),
- AlternateText = string.Format(_translationService.GetResource("Media.Blog.ImageAlternateTextFormat"), post.Title)
+ AlternateText = string.Format(_translationService.GetResource("Media.Blog.ImageAlternateTextFormat"), post.Title),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
pictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id))) ?
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
index b76a11383..2c58e7558 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
@@ -59,6 +59,8 @@ namespace Grand.Web.Features.Handlers.Catalog
Id = brand.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(brand.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(brand.PictureId, _mediaSettings.BrandThumbPictureSize),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
modelBrand.PictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, request.Language.Id))) ?
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
index 0b64f8dae..38042fe0c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
@@ -65,6 +65,8 @@ namespace Grand.Web.Features.Handlers.Catalog
Id = x.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(x.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(x.PictureId, _mediaSettings.CategoryThumbPictureSize),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
catModel.PictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, request.Language.Id))) ?
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
index f1d1db785..4861291d6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
@@ -117,6 +117,8 @@ namespace Grand.Web.Features.Handlers.Catalog
Id = x.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(x.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(x.PictureId, _mediaSettings.CategoryThumbPictureSize),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
subCatModel.PictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, request.Language.Id))) ?
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
index 65a7f7b7f..7f666f8cd 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
@@ -59,6 +59,8 @@ namespace Grand.Web.Features.Handlers.Catalog
Id = collection.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(collection.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(collection.PictureId, _mediaSettings.CollectionThumbPictureSize),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
modelcollection.PictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, request.Language.Id))) ?
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
index 4c9f892c8..baf2fc159 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
@@ -66,8 +66,8 @@ namespace Grand.Web.Features.Handlers.Catalog
Id = x.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(x.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(x.PictureId, _mediaSettings.CategoryThumbPictureSize),
- //Title = string.Format(_translationService.GetResource("Media.Category.ImageLinkTitleFormat"), manModel.Name),
- //AlternateText = string.Format(_translationService.GetResource("Media.Category.ImageAlternateTextFormat"), manModel.Name)
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
colModel.PictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, request.Language.Id))) ?
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
index 9201c1142..4257550d8 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
@@ -56,6 +56,8 @@ namespace Grand.Web.Features.Handlers.Catalog
Id = x.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(x.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(x.PictureId, _mediaSettings.CategoryThumbPictureSize),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
catModel.PictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, request.Language.Id))) ?
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
index 7def10da4..3518f2011 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
@@ -565,6 +565,8 @@ namespace Grand.Web.Features.Handlers.Products
Id = defaultPicture.PictureId,
ImageUrl = await _pictureService.GetPictureUrl(defaultPicture.PictureId, defaultPictureSize, !isAssociatedProduct),
FullSizeImageUrl = await _pictureService.GetPictureUrl(defaultPicture.PictureId, 0, !isAssociatedProduct),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
defaultPictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id))) ?
@@ -587,6 +589,8 @@ namespace Grand.Web.Features.Handlers.Products
ThumbImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId, _mediaSettings.ProductThumbPictureSizeOnProductDetailsPage),
ImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId, _mediaSettings.ProductDetailsPictureSize),
FullSizeImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
pictureModel.Title = !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id)) ?
@@ -1093,7 +1097,9 @@ namespace Grand.Web.Features.Handlers.Products
var pictureModel = new PictureModel {
Id = productPicture.PictureId,
ImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId, _mediaSettings.ProductBundlePictureSize),
- FullSizeImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId)
+ FullSizeImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
pictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.TitleAttribute)) ?
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
index c65882e5b..2cdc54001 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
@@ -432,7 +432,9 @@ namespace Grand.Web.Features.Handlers.Products
{
Id = productpicture.PictureId,
ImageUrl = await _pictureService.GetPictureUrl(productpicture.PictureId, pictureSize),
- FullSizeImageUrl = await _pictureService.GetPictureUrl(productpicture.PictureId)
+ FullSizeImageUrl = await _pictureService.GetPictureUrl(productpicture.PictureId),
+ Style = picture?.Style,
+ ExtraField = picture?.ExtraField
};
//"title" attribute
pictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id))) ?
diff --git a/src/Web/Grand.Web/Models/Media/PictureModel.cs b/src/Web/Grand.Web/Models/Media/PictureModel.cs
index e602b127e..adc10d27b 100644
--- a/src/Web/Grand.Web/Models/Media/PictureModel.cs
+++ b/src/Web/Grand.Web/Models/Media/PictureModel.cs
@@ -9,5 +9,7 @@ namespace Grand.Web.Models.Media
public string FullSizeImageUrl { get; set; }
public string Title { get; set; }
public string AlternateText { get; set; }
+ public string Style { get; set; }
+ public string ExtraField { get; set; }
}
}
\ No newline at end of file