Update to version 1.3.0:

- Fixed pagination for slide widget zones; - fixed table names;
iAlexeyProkhorov · Feb 24, 2021 · 6944578 · 6944578
1 parent c967197
commit 6944578
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 70 deletions.
diff --git a/Content/localization.en-US.xml b/Content/localization.en-US.xml
@@ -3,6 +3,9 @@
 	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.DontForgetToClearSiteCacheToSeeYourSliderChanges">
 		<Value>ATTENTION! Static cache is switched on. Clear nopCommerce cache to see applied changes.</Value>
 	</LocaleResource>
+	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.ClearNopCommerceWidgetZoneAfterNewWidgetZoneCreation">
+		<Value>ATTENTION! Clear nopCommerce cache after new widget zone creation. New widget zone willn't displays without this step.</Value>
+	</LocaleResource>
 	<!--CONFIGURATION-->
 	<LocaleResource Name="Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.Configuration.UseStaticCache">
 		<Value>Use static cache</Value>
@@ -356,7 +359,7 @@
 		<Value>Add widget zone to slide</Value>
 	</LocaleResource>
 	<LocaleResource Name="nop.plugin.baroque.widgets.qboslide.admin.slide.youcanaddwidgetzonestothisslideaftersaving">
-		<Value>You can't add widget zones to slide before saving. Save slide at first and then add widget zones to it.</Value>
+		<Value>You can't add slide to widget zone before save. Save slide at first and then add it to widget zone.</Value>
 	</LocaleResource>
 	<!--ADMIN SLIDE LIST-->
 	<LocaleResource Name="nop.plugin.baroque.widgets.qboslider.admin.slide.list">

diff --git a/Controllers/qBoSlideController.cs b/Controllers/qBoSlideController.cs
@@ -172,8 +172,6 @@ protected virtual void UpdateStoreMapping(Slide slide, SlideModel model)
 
         protected virtual void SaveCustomerRolesAcl(Slide slide, SlideModel model)
         {
-            slide.SubjectToAcl = model.SelectedCustomerRoleIds.Any();
-
             var existingAclRecords = _aclService.GetAclRecords(slide);
             var allCustomerRoles = _customerService.GetAllCustomerRoles(true);
             foreach (var customerRole in allCustomerRoles)
@@ -256,8 +254,7 @@ public virtual IActionResult Create(SlideModel model, bool continueEditing)
                 EndDateUtc = model.EndDateUtc,
                 Published = model.Published,
                 LimitedToStores = model.SelectedStoreIds.Any(),
-                //1.0.5 all with Alc
-                SubjectToAcl = model.SelectedCustomerRoleIds.Count > 0
+                SubjectToAcl = model.SelectedCustomerRoleIds.Any()
             };
             _slideService.InsertSlide(slide);
 
@@ -333,9 +330,7 @@ public virtual IActionResult Edit(SlideModel model, bool continueEditing)
             slide.EndDateUtc = model.EndDateUtc;
             slide.Published = model.Published;
             slide.LimitedToStores = model.SelectedStoreIds.Any();
-
-            //1.0.5 all with Alc
-            slide.SubjectToAcl = model.SelectedCustomerRoleIds.Count > 0;
+            slide.SubjectToAcl = model.SelectedCustomerRoleIds.Any();
 
             _slideService.UpdateSlide(slide);
 

diff --git a/Controllers/qBoWidgetZoneController.cs b/Controllers/qBoWidgetZoneController.cs
@@ -101,10 +101,6 @@ public qBoWidgetZoneController(IAclService aclService,
         /// <param name="widgetZone">Widget zone entity</param>
         protected virtual void SaveWidgetZoneAcl(WidgetZoneModel model, WidgetZone widgetZone)
         {
-            //mark entity like subject to ACL
-            widgetZone.SubjectToAcl = model.SelectedCustomerRoleIds.Any();
-            _widgetZoneService.UpdateWidgetZone(widgetZone);
-
             var existingAclRecords = _aclService.GetAclRecords(widgetZone);
             var allCustomerRoles = _customerService.GetAllCustomerRoles(true);
 
@@ -134,10 +130,6 @@ protected virtual void SaveWidgetZoneAcl(WidgetZoneModel model, WidgetZone widge
         /// <param name="widgetZone">Widget zone entity</param>
         protected virtual void SaveWidgetZoneStoreMappings(WidgetZoneModel model, WidgetZone widgetZone)
         {
-            //mark entity like limited to stores
-            widgetZone.LimitedToStores = model.SelectedStoreIds.Any();
-            _widgetZoneService.UpdateWidgetZone(widgetZone);
-
             var existingStoreMappings = _storeMappingService.GetStoreMappings(widgetZone);
             var allStores = _storeService.GetAllStores();
 
@@ -242,8 +234,8 @@ public virtual IActionResult Create(WidgetZoneModel model, bool continueEditing)
                 //put widget zone properties
                 Name = model.Name,
                 SystemName = model.SystemName,
-                LimitedToStores = model.LimitedToStores,
-                SubjectToAcl = model.SubjectToAcl,
+                LimitedToStores = model.SelectedStoreIds.Any(),
+                SubjectToAcl = model.SelectedCustomerRoleIds.Any(),
                 Published = model.Published,
             };
 
@@ -328,6 +320,8 @@ public virtual IActionResult Edit(WidgetZoneModel model, bool continueEditing)
             widgetZone.MaxSlideWidgetZoneWidth = model.MaxSlideWidgetZoneWidth;
             widgetZone.SlideDuration = model.SlideDuration;
             widgetZone.SlideSpacing = model.SlideSpacing;
+            widgetZone.SubjectToAcl = model.SelectedCustomerRoleIds.Any();
+            widgetZone.LimitedToStores = model.SelectedStoreIds.Any();
 
             //update entity
             _widgetZoneService.UpdateWidgetZone(widgetZone);

diff --git a/Domain/Slide.cs b/Domain/Slide.cs
@@ -27,7 +27,7 @@ public partial class Slide : BaseEntity, ILocalizedEntity, IStoreMappingSupporte
     {
         /// <summary>
         /// Gets or sets slide name.
-        /// Using only for administrator needs
+        /// Use only for administrator needs
         /// </summary>
         public string Name { get; set; }
 

diff --git a/Domain/WidgetZone.cs b/Domain/WidgetZone.cs
@@ -33,6 +33,11 @@ public class WidgetZone : BaseEntity, IAclSupported, IStoreMappingSupported
         /// </summary>
         public string SystemName { get; set; }
 
+        /// <summary>
+        /// Gets or sets widget zone slides transition effects collection
+        /// </summary>
+        public string TransitionEffects { get; set; }
+
         /// <summary>
         /// 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
         /// </summary>
@@ -73,29 +78,11 @@ public class WidgetZone : BaseEntity, IAclSupported, IStoreMappingSupported
         /// </summary>
         public int ArrowNavigationDisplayingTypeId { get; set; }
 
-        /// <summary>
-        /// Gets or sets arrow navigation displaying type
-        /// </summary>
-        //public NavigationType ArrowNavigationDisplayingType
-        //{
-        //    get { return (NavigationType)ArrowNavigationDisplayingTypeId; }
-        //    set { ArrowNavigationDisplayingTypeId = (int)value; }
-        //}
-
         /// <summary>
         /// Gets or sets bullet navigation displaying type id
         /// </summary>
         public int BulletNavigationDisplayingTypeId { get; set; }
 
-        /// <summary>
-        /// Gets or sets bullet navigation displaying type
-        /// </summary>
-        //public NavigationType BulletNavigationDisplayingType
-        //{
-        //    get { return (NavigationType)BulletNavigationDisplayingTypeId; }
-        //    set { BulletNavigationDisplayingTypeId = (int)value; }
-        //}
-
         /// <summary>
         /// Gets or sets slide displaying for current widget zone. 'true' - display slider.
         /// </summary>

diff --git a/Factories/Admin/SlideWidgetZoneModelFactory.cs b/Factories/Admin/SlideWidgetZoneModelFactory.cs
@@ -131,7 +131,7 @@ public virtual SlideWidgetZoneSearchModel.WidgetZonePagedList PrepareWidgetZoneL
         /// <returns>Slide widget zone list</returns>
         public virtual AddSlideWidgetZoneModel.WidgetZonePagedList PrepareWidgetZoneList(AddSlideWidgetZoneModel searchModel)
         {
-            var allWidgetZones = _widgetZoneService.GetWidgetZones(searchModel.SearchWidgetZoneName, searchModel.SearchWidgetZoneSystemName);
+            var allWidgetZones = _widgetZoneService.GetWidgetZones(searchModel.SearchWidgetZoneName, searchModel.SearchWidgetZoneSystemName, true, searchModel.Page - 1, searchModel.PageSize);
             var gridModel = new AddSlideWidgetZoneModel.WidgetZonePagedList().PrepareToGrid(searchModel, allWidgetZones, () =>
             {
                 return allWidgetZones.Select(widgetZone =>

diff --git a/Factories/Admin/WidgetZoneModelFactory.cs b/Factories/Admin/WidgetZoneModelFactory.cs
@@ -112,7 +112,6 @@ public virtual WidgetZoneModel PrepareWidgetZoneModel(WidgetZoneModel model, Wid
                     AutoPlayInterval = widgetZone.AutoPlayInterval,
                     BulletNavigationDisplayingTypeId = widgetZone.BulletNavigationDisplayingTypeId,
                     AvailableBulletNavigations = NavigationType.Always.ToSelectList().ToList(),
-                    LimitedToStores = widgetZone.LimitedToStores,
                     Id = widgetZone.Id,
                     MinDragOffsetToSlide = widgetZone.MinDragOffsetToSlide,
                     MinSlideWidgetZoneWidth = widgetZone.MinSlideWidgetZoneWidth,
@@ -121,7 +120,6 @@ public virtual WidgetZoneModel PrepareWidgetZoneModel(WidgetZoneModel model, Wid
                     Published = widgetZone.Published,
                     SlideDuration = widgetZone.SlideDuration,
                     SlideSpacing = widgetZone.SlideSpacing,
-                    SubjectToAcl = widgetZone.SubjectToAcl,
                     SystemName = widgetZone.SystemName,
                 };
 

diff --git a/Mapping/qBoSliderNamesCompatibility.cs b/Mapping/qBoSliderNamesCompatibility.cs
@@ -15,11 +15,11 @@ public class qBoSliderNamesCompatibility : INameCompatibility
         /// <summary>
         /// Gets table name for mapping with the type
         /// </summary>
-        public Dictionary<Type, string> TableNames { get; } = new Dictionary<Type, string>()
+        public Dictionary<Type, string> TableNames => new Dictionary<Type, string>()
         {
             { typeof(WidgetZone), "Baroque_qBoSlider_WidgetZone" },
             { typeof(Slide), "Baroque_qBoSlider_Slide" },
-            { typeof(WidgetZoneSlide), "Baroque_qBoSlider_WidgetZoneSlide" }
+            { typeof(WidgetZoneSlide), "Baroque_qBoSlider_WidgetZone_Slide_Mapping" }
         };
 
         /// <summary>

diff --git a/Models/Admin/WidgetZones/WidgetZoneModel.cs b/Models/Admin/WidgetZones/WidgetZoneModel.cs
@@ -92,16 +92,6 @@ public partial class WidgetZoneModel : BaseNopEntityModel
         [NopResourceDisplayName("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.WidgetZone.Fields.Published")]
         public bool Published { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the entity is subject to ACL
-        /// </summary>
-        public bool SubjectToAcl { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the entity is limited/restricted to certain stores
-        /// </summary>
-        public bool LimitedToStores { get; set; }
-
         /// <summary>
         /// Gets or sets selected customer role ids
         /// </summary>

diff --git a/Nop.Plugin.Widgets.qBoSlider.csproj b/Nop.Plugin.Widgets.qBoSlider.csproj
@@ -16,7 +16,7 @@
     <PackageProjectUrl></PackageProjectUrl>
     <RepositoryUrl>https://github.com/iAlexeyProkhorov/qBoSlider</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
-    <Version>1.2.8</Version>
+    <Version>1.3.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -33,7 +33,6 @@
     <Compile Remove="Infrastructure\EfStartUpTask.cs" />
     <Compile Remove="Infrastructure\qBoSliderContext.cs" />
     <Compile Remove="Infrastructure\RouteProvider.cs" />
-    <Compile Remove="Mapping\qBoSliderNamesCompatibility.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Views/Admin/WidgetZone/Create.cshtml b/Views/Admin/WidgetZone/Create.cshtml
@@ -28,5 +28,11 @@
             @await Component.InvokeAsync("AdminWidget", new { widgetZone = "qBo_slider_widget_create_buttons" })
         </div>
     </div>
+    <div class="content-header clearfix">
+        <div class="ui-state-highlight ui-corner-all" style="margin-top:0;padding:10px">
+            <span class="ui-icon ui-icon-info" style="float:left;margin-right:.3em"></span>
+            @T("Nop.Plugin.Baroque.Widgets.qBoSlider.Admin.ClearNopCommerceWidgetZoneAfterNewWidgetZoneCreation")
+        </div>
+    </div>
     @await Html.PartialAsync("~/Plugins/Widgets.qBoSlider/Views/Admin/WidgetZone/_CreateOrUpdate.cshtml", Model)
 </form>
diff --git a/plugin.json b/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Widgets",
   "FriendlyName": "qBoSlider",
   "SystemName": "Widgets.qBoSlider",
-  "Version": "1.2.8",
+  "Version": "1.3.0",
   "SupportedVersions": [ "4.30" ],
   "Author": "Baroque team",
   "DisplayOrder": 1,

diff --git a/qBoSliderSettings.cs b/qBoSliderSettings.cs
@@ -11,20 +11,5 @@ public class qBoSliderSettings : ISettings
         /// Gets or sets value indicating plugin static cache usage
         /// </summary>
         public bool UseStaticCache { get; set; }
-
-        /// <summary>
-        /// Gets or sets value indicating static cache clearing after saving widget zone parameters.
-        /// </summary>
-        public bool ClearCacheAfterWidgetZoneChanging { get; set; }
-
-        /// <summary>
-        /// Gets or sets value indicating about static cache clearing after slide saving.
-        /// </summary>
-        public bool ClearCacheAfterSlideChanging { get; set; }
-
-        /// <summary>
-        /// Gets or sets value indicating about static cache clearing after widget zone slide saving.
-        /// </summary>
-        public bool ClearCacheAfterWidgetZoneSlideChanging { get; set; }
     }
 }