Skip to content

Commit 6944578

Browse files
iAlexeyProkhoroviAlexeyProkhorov
committed
Update to version 1.3.0:
 - Fixed pagination for slide widget zones; - fixed table names;
1 parent c967197 commit 6944578

File tree

13 files changed

+27
-70
lines changed

13 files changed

+27
-70
lines changed

‎Content/localization.en-US.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.DontForgetToClearSiteCacheToSeeYourSliderChanges">
44
<Value>ATTENTION! Static cache is switched on. Clear nopCommerce cache to see applied changes.</Value>
55
</LocaleResource>
6+
<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.ClearNopCommerceWidgetZoneAfterNewWidgetZoneCreation">
7+
<Value>ATTENTION! Clear nopCommerce cache after new widget zone creation. New widget zone willn't displays without this step.</Value>
8+
</LocaleResource>
69
<!--CONFIGURATION-->
710
<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Configuration.UseStaticCache">
811
<Value>Use static cache</Value>
@@ -356,7 +359,7 @@
356359
<Value>Add widget zone to slide</Value>
357360
</LocaleResource>
358361
<LocaleResource Name="nop.plugin.baroque.widgets.qboslide.admin.slide.youcanaddwidgetzonestothisslideaftersaving">
359-
<Value>You can't add widget zones to slide before saving. Save slide at first and then add widget zones to it.</Value>
362+
<Value>You can't add slide to widget zone before save. Save slide at first and then add it to widget zone.</Value>
360363
</LocaleResource>
361364
<!--ADMIN SLIDE LIST-->
362365
<LocaleResource Name="nop.plugin.baroque.widgets.qboslider.admin.slide.list">

‎Controllers/qBoSlideController.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,6 @@ protected virtual void UpdateStoreMapping(Slide slide, SlideModel model)
172172

173173
protected virtual void SaveCustomerRolesAcl(Slide slide, SlideModel model)
174174
{
175-
slide.SubjectToAcl = model.SelectedCustomerRoleIds.Any();
176-
177175
var existingAclRecords = _aclService.GetAclRecords(slide);
178176
var allCustomerRoles = _customerService.GetAllCustomerRoles(true);
179177
foreach (var customerRole in allCustomerRoles)
@@ -256,8 +254,7 @@ public virtual IActionResult Create(SlideModel model, bool continueEditing)
256254
EndDateUtc = model.EndDateUtc,
257255
Published = model.Published,
258256
LimitedToStores = model.SelectedStoreIds.Any(),
259-
//1.0.5 all with Alc
260-
SubjectToAcl = model.SelectedCustomerRoleIds.Count > 0
257+
SubjectToAcl = model.SelectedCustomerRoleIds.Any()
261258
};
262259
_slideService.InsertSlide(slide);
263260

@@ -333,9 +330,7 @@ public virtual IActionResult Edit(SlideModel model, bool continueEditing)
333330
slide.EndDateUtc = model.EndDateUtc;
334331
slide.Published = model.Published;
335332
slide.LimitedToStores = model.SelectedStoreIds.Any();
336-
337-
//1.0.5 all with Alc
338-
slide.SubjectToAcl = model.SelectedCustomerRoleIds.Count > 0;
333+
slide.SubjectToAcl = model.SelectedCustomerRoleIds.Any();
339334

340335
_slideService.UpdateSlide(slide);
341336

‎Controllers/qBoWidgetZoneController.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ public qBoWidgetZoneController(IAclService aclService,
101101
/// <param name="widgetZone">Widget zone entity</param>
102102
protected virtual void SaveWidgetZoneAcl(WidgetZoneModel model, WidgetZone widgetZone)
103103
{
104-
//mark entity like subject to ACL
105-
widgetZone.SubjectToAcl = model.SelectedCustomerRoleIds.Any();
106-
_widgetZoneService.UpdateWidgetZone(widgetZone);
107-
108104
var existingAclRecords = _aclService.GetAclRecords(widgetZone);
109105
var allCustomerRoles = _customerService.GetAllCustomerRoles(true);
110106

@@ -134,10 +130,6 @@ protected virtual void SaveWidgetZoneAcl(WidgetZoneModel model, WidgetZone widge
134130
/// <param name="widgetZone">Widget zone entity</param>
135131
protected virtual void SaveWidgetZoneStoreMappings(WidgetZoneModel model, WidgetZone widgetZone)
136132
{
137-
//mark entity like limited to stores
138-
widgetZone.LimitedToStores = model.SelectedStoreIds.Any();
139-
_widgetZoneService.UpdateWidgetZone(widgetZone);
140-
141133
var existingStoreMappings = _storeMappingService.GetStoreMappings(widgetZone);
142134
var allStores = _storeService.GetAllStores();
143135

@@ -242,8 +234,8 @@ public virtual IActionResult Create(WidgetZoneModel model, bool continueEditing)
242234
//put widget zone properties
243235
Name = model.Name,
244236
SystemName = model.SystemName,
245-
LimitedToStores = model.LimitedToStores,
246-
SubjectToAcl = model.SubjectToAcl,
237+
LimitedToStores = model.SelectedStoreIds.Any(),
238+
SubjectToAcl = model.SelectedCustomerRoleIds.Any(),
247239
Published = model.Published,
248240
};
249241

@@ -328,6 +320,8 @@ public virtual IActionResult Edit(WidgetZoneModel model, bool continueEditing)
328320
widgetZone.MaxSlideWidgetZoneWidth = model.MaxSlideWidgetZoneWidth;
329321
widgetZone.SlideDuration = model.SlideDuration;
330322
widgetZone.SlideSpacing = model.SlideSpacing;
323+
widgetZone.SubjectToAcl = model.SelectedCustomerRoleIds.Any();
324+
widgetZone.LimitedToStores = model.SelectedStoreIds.Any();
331325

332326
//update entity
333327
_widgetZoneService.UpdateWidgetZone(widgetZone);

‎Domain/Slide.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public partial class Slide : BaseEntity, ILocalizedEntity, IStoreMappingSupporte
2727
{
2828
/// <summary>
2929
/// Gets or sets slide name.
30-
/// Using only for administrator needs
30+
/// Use only for administrator needs
3131
/// </summary>
3232
public string Name { get; set; }
3333

‎Domain/WidgetZone.cs‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ public class WidgetZone : BaseEntity, IAclSupported, IStoreMappingSupported
3333
/// </summary>
3434
public string SystemName { get; set; }
3535

36+
/// <summary>
37+
/// Gets or sets widget zone slides transition effects collection
38+
/// </summary>
39+
public string TransitionEffects { get; set; }
40+
3641
/// <summary>
3742
/// Gets or sets interval (in milliseconds) to go for next slide since the previous stopped if the slider is auto playing, default value is 3000
3843
/// </summary>
@@ -73,29 +78,11 @@ public class WidgetZone : BaseEntity, IAclSupported, IStoreMappingSupported
7378
/// </summary>
7479
public int ArrowNavigationDisplayingTypeId { get; set; }
7580

76-
/// <summary>
77-
/// Gets or sets arrow navigation displaying type
78-
/// </summary>
79-
//public NavigationType ArrowNavigationDisplayingType
80-
//{
81-
// get { return (NavigationType)ArrowNavigationDisplayingTypeId; }
82-
// set { ArrowNavigationDisplayingTypeId = (int)value; }
83-
//}
84-
8581
/// <summary>
8682
/// Gets or sets bullet navigation displaying type id
8783
/// </summary>
8884
public int BulletNavigationDisplayingTypeId { get; set; }
8985

90-
/// <summary>
91-
/// Gets or sets bullet navigation displaying type
92-
/// </summary>
93-
//public NavigationType BulletNavigationDisplayingType
94-
//{
95-
// get { return (NavigationType)BulletNavigationDisplayingTypeId; }
96-
// set { BulletNavigationDisplayingTypeId = (int)value; }
97-
//}
98-
9986
/// <summary>
10087
/// Gets or sets slide displaying for current widget zone. 'true' - display slider.
10188
/// </summary>

‎Factories/Admin/SlideWidgetZoneModelFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public virtual SlideWidgetZoneSearchModel.WidgetZonePagedList PrepareWidgetZoneL
131131
/// <returns>Slide widget zone list</returns>
132132
public virtual AddSlideWidgetZoneModel.WidgetZonePagedList PrepareWidgetZoneList(AddSlideWidgetZoneModel searchModel)
133133
{
134-
var allWidgetZones = _widgetZoneService.GetWidgetZones(searchModel.SearchWidgetZoneName, searchModel.SearchWidgetZoneSystemName);
134+
var allWidgetZones = _widgetZoneService.GetWidgetZones(searchModel.SearchWidgetZoneName, searchModel.SearchWidgetZoneSystemName, true, searchModel.Page - 1, searchModel.PageSize);
135135
var gridModel = new AddSlideWidgetZoneModel.WidgetZonePagedList().PrepareToGrid(searchModel, allWidgetZones, () =>
136136
{
137137
return allWidgetZones.Select(widgetZone =>

‎Factories/Admin/WidgetZoneModelFactory.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ public virtual WidgetZoneModel PrepareWidgetZoneModel(WidgetZoneModel model, Wid
112112
AutoPlayInterval = widgetZone.AutoPlayInterval,
113113
BulletNavigationDisplayingTypeId = widgetZone.BulletNavigationDisplayingTypeId,
114114
AvailableBulletNavigations = NavigationType.Always.ToSelectList().ToList(),
115-
LimitedToStores = widgetZone.LimitedToStores,
116115
Id = widgetZone.Id,
117116
MinDragOffsetToSlide = widgetZone.MinDragOffsetToSlide,
118117
MinSlideWidgetZoneWidth = widgetZone.MinSlideWidgetZoneWidth,
@@ -121,7 +120,6 @@ public virtual WidgetZoneModel PrepareWidgetZoneModel(WidgetZoneModel model, Wid
121120
Published = widgetZone.Published,
122121
SlideDuration = widgetZone.SlideDuration,
123122
SlideSpacing = widgetZone.SlideSpacing,
124-
SubjectToAcl = widgetZone.SubjectToAcl,
125123
SystemName = widgetZone.SystemName,
126124
};
127125

‎Mapping/qBoSliderNamesCompatibility.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ public class qBoSliderNamesCompatibility : INameCompatibility
1515
/// <summary>
1616
/// Gets table name for mapping with the type
1717
/// </summary>
18-
public Dictionary<Type, string> TableNames { get; } = new Dictionary<Type, string>()
18+
public Dictionary<Type, string> TableNames => new Dictionary<Type, string>()
1919
{
2020
{ typeof(WidgetZone), "Baroque_qBoSlider_WidgetZone" },
2121
{ typeof(Slide), "Baroque_qBoSlider_Slide" },
22-
{ typeof(WidgetZoneSlide), "Baroque_qBoSlider_WidgetZoneSlide" }
22+
{ typeof(WidgetZoneSlide), "Baroque_qBoSlider_WidgetZone_Slide_Mapping" }
2323
};
2424

2525
/// <summary>

‎Models/Admin/WidgetZones/WidgetZoneModel.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,6 @@ public partial class WidgetZoneModel : BaseNopEntityModel
9292
[NopResourceDisplayName("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.WidgetZone.Fields.Published")]
9393
public bool Published { get; set; }
9494

95-
/// <summary>
96-
/// Gets or sets a value indicating whether the entity is subject to ACL
97-
/// </summary>
98-
public bool SubjectToAcl { get; set; }
99-
100-
/// <summary>
101-
/// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
102-
/// </summary>
103-
public bool LimitedToStores { get; set; }
104-
10595
/// <summary>
10696
/// Gets or sets selected customer role ids
10797
/// </summary>

‎Nop.Plugin.Widgets.qBoSlider.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageProjectUrl></PackageProjectUrl>
1717
<RepositoryUrl>https://github.com/iAlexeyProkhorov/qBoSlider</RepositoryUrl>
1818
<RepositoryType>Git</RepositoryType>
19-
<Version>1.2.8</Version>
19+
<Version>1.3.0</Version>
2020
</PropertyGroup>
2121

2222
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -33,7 +33,6 @@
3333
<Compile Remove="Infrastructure\EfStartUpTask.cs" />
3434
<Compile Remove="Infrastructure\qBoSliderContext.cs" />
3535
<Compile Remove="Infrastructure\RouteProvider.cs" />
36-
<Compile Remove="Mapping\qBoSliderNamesCompatibility.cs" />
3736
</ItemGroup>
3837

3938
<ItemGroup>

0 commit comments

Comments
 (0)