Please execute "update-database -TargetMigration PictureSize"

mgesing · mgesing · commit dbbf915519c6 · 2017-01-25T19:53:46.000+01:00
diff --git a/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs b/src/Libraries/SmartStore.Core/Domain/Catalog/SpecificationAttribute.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using SmartStore.Core.Domain.Localization;
 using System.Runtime.Serialization;
+using SmartStore.Core.Search.Facets;
 
 namespace SmartStore.Core.Domain.Catalog
 {
@@ -30,9 +31,15 @@ public partial class SpecificationAttribute : BaseEntity, ILocalizedEntity
 		[DataMember]
 		public int DisplayOrder { get; set; }
 
-        /// <summary>
-        /// Gets or sets the specification attribute options
-        /// </summary>
+		/// <summary>
+		/// Gets or sets the sorting of facets. Only effective in accordance with MegaSearchPlus plugin.
+		/// </summary>
+		[DataMember]
+		public FacetSorting FacetSorting { get; set; }
+
+		/// <summary>
+		/// Gets or sets the specification attribute options
+		/// </summary>
 		[DataMember]
 		public virtual ICollection<SpecificationAttributeOption> SpecificationAttributeOptions
         {
diff --git a/src/Libraries/SmartStore.Core/Search/Facets/FacetDescriptor.cs b/src/Libraries/SmartStore.Core/Search/Facets/FacetDescriptor.cs
@@ -17,12 +17,6 @@ public enum ValueOperator
 			Or
 		}
 
-		public enum Sorting
-		{
-			HitsDesc,
-			ValueAsc
-		}
-
 		private readonly List<FacetValue> _values;
 
 		public FacetDescriptor(string key)
@@ -93,7 +87,7 @@ public int MaxChoicesCount
 		/// <summary>
 		/// Gets or sets the result choices sort order.
 		/// </summary>
-		public Sorting OrderBy
+		public FacetSorting OrderBy
 		{
 			get;
 			set;
@@ -118,13 +112,21 @@ public override string ToString()
 	}
 
 
+	public enum FacetSorting
+	{
+		HitsDesc,
+		ValueAsc,
+		DisplayOrder
+	}
+
+
 	public static class FacetDescriptorExtensions
 	{
-		public static IOrderedEnumerable<Facet> OrderBy(this IEnumerable<Facet> source, FacetDescriptor.Sorting sorting)
+		public static IOrderedEnumerable<Facet> OrderBy(this IEnumerable<Facet> source, FacetSorting sorting)
 		{
 			Guard.NotNull(source, nameof(source));
 
-			if (sorting == FacetDescriptor.Sorting.HitsDesc)
+			if (sorting == FacetSorting.HitsDesc)
 			{
 				return source.OrderByDescending(x => x.HitCount);
 			}
diff --git a/src/Libraries/SmartStore.Core/Search/SearchSettings.cs b/src/Libraries/SmartStore.Core/Search/SearchSettings.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using SmartStore.Core.Configuration;
-using SmartStore.Core.Search.Facets;
 
 namespace SmartStore.Core.Search
 {
@@ -16,7 +15,6 @@ public SearchSettings()
 			InstantSearchTermMinLength = 2;
 			FilterMinHitCount = 1;
 			FilterMaxChoicesCount = 20;
-			FilterOrderBy = FacetDescriptor.Sorting.HitsDesc;
 		}
 
 		/// <summary>
@@ -64,11 +62,6 @@ public SearchSettings()
 		/// </summary>
 		public int FilterMaxChoicesCount { get; set; }
 
-		/// <summary>
-		/// Gets or sets the filter value order
-		/// </summary>
-		public FacetDescriptor.Sorting FilterOrderBy { get; set; }
-
 		// TBD: what about area specific searchin setting (product, blog, etc.)
 	}
 }
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeMap.cs
@@ -10,7 +10,7 @@ public SpecificationAttributeMap()
             this.ToTable("SpecificationAttribute");
             this.HasKey(sa => sa.Id);
             this.Property(sa => sa.Name).IsRequired();
-			this.Property(sa => sa.Alias).HasMaxLength(100);
+			this.Property(sa => sa.Alias).HasMaxLength(30);
 		}
     }
 }
diff --git a/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs b/src/Libraries/SmartStore.Data/Mapping/Catalog/SpecificationAttributeOptionMap.cs
@@ -10,7 +10,7 @@ public SpecificationAttributeOptionMap()
             this.ToTable("SpecificationAttributeOption");
             this.HasKey(sao => sao.Id);
             this.Property(sao => sao.Name).IsRequired();
-			this.Property(sao => sao.Alias).HasMaxLength(100);
+			this.Property(sao => sao.Alias).HasMaxLength(30);
 
 			this.HasRequired(sao => sao.SpecificationAttribute)
                 .WithMany(sa => sa.SpecificationAttributeOptions)
diff --git a/src/Libraries/SmartStore.Data/Migrations/201701240959492_SpecificationAttributeAlias.resx b/src/Libraries/SmartStore.Data/Migrations/201701240959492_SpecificationAttributeAlias.resx
diff --git a/src/Libraries/SmartStore.Data/Migrations/201701251835419_SpecificationAttributeAlias.Designer.cs b/src/Libraries/SmartStore.Data/Migrations/201701251835419_SpecificationAttributeAlias.Designer.cs
diff --git a/src/Libraries/SmartStore.Data/Migrations/201701251835419_SpecificationAttributeAlias.cs b/src/Libraries/SmartStore.Data/Migrations/201701251835419_SpecificationAttributeAlias.cs
@@ -7,12 +7,14 @@ public partial class SpecificationAttributeAlias : DbMigration
     {
         public override void Up()
         {
-            AddColumn("dbo.SpecificationAttributeOption", "Alias", c => c.String(maxLength: 100));
-            AddColumn("dbo.SpecificationAttribute", "Alias", c => c.String(maxLength: 100));
+            AddColumn("dbo.SpecificationAttributeOption", "Alias", c => c.String(maxLength: 30));
+            AddColumn("dbo.SpecificationAttribute", "Alias", c => c.String(maxLength: 30));
+            AddColumn("dbo.SpecificationAttribute", "FacetSorting", c => c.Int(nullable: false));
         }
         
         public override void Down()
         {
+            DropColumn("dbo.SpecificationAttribute", "FacetSorting");
             DropColumn("dbo.SpecificationAttribute", "Alias");
             DropColumn("dbo.SpecificationAttributeOption", "Alias");
         }
diff --git a/src/Libraries/SmartStore.Data/Migrations/201701251835419_SpecificationAttributeAlias.resx b/src/Libraries/SmartStore.Data/Migrations/201701251835419_SpecificationAttributeAlias.resx
diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs
@@ -371,20 +371,18 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
 				"Specifies the maximum number of filters per group.",
 				"Legt die maximale Anzahl an Filtern pro Gruppe fest.");
 
-			builder.AddOrUpdate("Admin.Configuration.Settings.Search.FilterOrderBy",
-				"Sort filters",
-				"Filter sortieren",
-				"Specifies the sorting of filters.",
-				"Legt die Sortierung von Filtern fest.");
-
-			builder.AddOrUpdate("Enums.SmartStore.Core.Search.Facets.FacetDescriptor.Sorting.HitsDesc",
+			builder.AddOrUpdate("Enums.SmartStore.Core.Search.Facets.FacetSorting.HitsDesc",
 				"Hit count: highest first",
 				"Trefferanzahl: H�chste zuerst");
 
-			builder.AddOrUpdate("Enums.SmartStore.Core.Search.Facets.FacetDescriptor.Sorting.ValueAsc",
+			builder.AddOrUpdate("Enums.SmartStore.Core.Search.Facets.FacetSorting.ValueAsc",
 				"Name: A to Z",
 				"Name: A bis Z");
 
+			builder.AddOrUpdate("Enums.SmartStore.Core.Search.Facets.FacetSorting.DisplayOrder",
+				"According to display order",
+				"Gem�� Reihenfolge");
+
 			builder.AddOrUpdate("Admin.Catalog.Attributes.SpecificationAttributes.Fields.Alias",
 				"Alias",
 				"Alias",
diff --git a/src/Libraries/SmartStore.Data/SmartStore.Data.csproj b/src/Libraries/SmartStore.Data/SmartStore.Data.csproj
@@ -447,9 +447,9 @@
     <Compile Include="Migrations\201701121659419_PictureSize.Designer.cs">
       <DependentUpon>201701121659419_PictureSize.cs</DependentUpon>
     </Compile>
-    <Compile Include="Migrations\201701240959492_SpecificationAttributeAlias.cs" />
-    <Compile Include="Migrations\201701240959492_SpecificationAttributeAlias.Designer.cs">
-      <DependentUpon>201701240959492_SpecificationAttributeAlias.cs</DependentUpon>
+    <Compile Include="Migrations\201701251835419_SpecificationAttributeAlias.cs" />
+    <Compile Include="Migrations\201701251835419_SpecificationAttributeAlias.Designer.cs">
+      <DependentUpon>201701251835419_SpecificationAttributeAlias.cs</DependentUpon>
     </Compile>
     <Compile Include="ObjectContextBase.SaveChanges.cs" />
     <Compile Include="Setup\Builder\ActivityLogTypeMigrator.cs" />
@@ -824,8 +824,8 @@
     <EmbeddedResource Include="Migrations\201701121659419_PictureSize.resx">
       <DependentUpon>201701121659419_PictureSize.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201701240959492_SpecificationAttributeAlias.resx">
-      <DependentUpon>201701240959492_SpecificationAttributeAlias.cs</DependentUpon>
+    <EmbeddedResource Include="Migrations\201701251835419_SpecificationAttributeAlias.resx">
+      <DependentUpon>201701251835419_SpecificationAttributeAlias.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Sql\Indexes.sql" />
     <EmbeddedResource Include="Sql\StoredProcedures.sql" />
diff --git a/src/Libraries/SmartStore.Services/Search/Modelling/CatalogSearchQueryFactory.cs b/src/Libraries/SmartStore.Services/Search/Modelling/CatalogSearchQueryFactory.cs
@@ -270,23 +270,24 @@ private void DetectViewMode(CatalogSearchQuery query, string sessionKey, string
 			query.CustomData["ViewMode"] = _catalogSettings.DefaultViewMode;
 		}
 
-		protected virtual void AddFacet(CatalogSearchQuery query, string fieldName, bool isMultiSelect, Action<FacetDescriptor> addValues)
+		protected virtual void AddFacet(
+			CatalogSearchQuery query,
+			string fieldName,
+			bool isMultiSelect,
+			FacetSorting sorting,
+			Action<FacetDescriptor> addValues)
 		{
 			if (!_globalFilterFields.Contains(fieldName))
 				return;
 			
 			var facet = new FacetDescriptor(fieldName);
 			facet.IsMultiSelect = isMultiSelect;
+			facet.OrderBy = sorting;
 
-			if (fieldName == "rate")
-			{
-				facet.OrderBy = FacetDescriptor.Sorting.ValueAsc;
-			}
-			else
+			if (fieldName != "rate")
 			{
 				facet.MinHitCount = _searchSettings.FilterMinHitCount;
 				facet.MaxChoicesCount = _searchSettings.FilterMaxChoicesCount;
-				facet.OrderBy = _searchSettings.FilterOrderBy;
 			}
 
 			addValues(facet);
@@ -304,7 +305,7 @@ protected virtual void ConvertCategory(CatalogSearchQuery query, RouteData route
 
 			var fieldName = (_catalogSettings.IncludeFeaturedProductsInNormalLists ? "categoryid" : "notfeaturedcategoryid");
 
-			AddFacet(query, fieldName, true, descriptor =>
+			AddFacet(query, fieldName, true, FacetSorting.HitsDesc, descriptor =>
 			{
 				if (ids != null && ids.Any())
 				{
@@ -322,7 +323,7 @@ protected virtual void ConvertManufacturer(CatalogSearchQuery query, RouteData r
 				query.WithManufacturerIds(null, ids.ToArray());
 			}
 
-			AddFacet(query, "manufacturerid", true, descriptor =>
+			AddFacet(query, "manufacturerid", true, FacetSorting.ValueAsc, descriptor =>
 			{
 				if (ids != null && ids.Any())
 				{
@@ -365,7 +366,7 @@ protected virtual void ConvertRating(CatalogSearchQuery query, RouteData routeDa
 				query.WithRating(fromRate, null);
 			}
 
-			AddFacet(query, "rate", false, descriptor =>
+			AddFacet(query, "rate", false, FacetSorting.ValueAsc, descriptor =>
 			{
 				if (fromRate.HasValue)
 				{
@@ -392,7 +393,7 @@ protected virtual void ConvertDeliveryTime(CatalogSearchQuery query, RouteData r
 				query.WithDeliveryTimeIds(ids.ToArray());
 			}
 
-			AddFacet(query, "deliveryid", true, descriptor =>
+			AddFacet(query, "deliveryid", true, FacetSorting.DisplayOrder, descriptor =>
 			{
 				if (ids != null && ids.Any())
 				{
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/SettingController.cs
@@ -1602,29 +1602,14 @@ public ActionResult Search()
 			model.ShowProductImagesInInstantSearch = settings.ShowProductImagesInInstantSearch;
 			model.FilterMinHitCount = settings.FilterMinHitCount;
 			model.FilterMaxChoicesCount = settings.FilterMaxChoicesCount;
-			model.FilterOrderBy = settings.FilterOrderBy;
-
+			
 			if (megaSearchDescriptor == null)
 			{
 				model.SearchFieldsNote = T("Admin.Configuration.Settings.Search.SearchFieldsNote");
 			}
 
 			model.AvailableSearchModes = settings.SearchMode.ToSelectList().ToList();
 
-			model.AvailableFilterOrders = new List<SelectListItem>
-			{
-				new SelectListItem
-				{
-					Text = T("Enums.SmartStore.Core.Search.Facets.FacetDescriptor.Sorting.HitsDesc"),
-					Value = ((int)FacetDescriptor.Sorting.HitsDesc).ToString()
-				},
-				new SelectListItem
-				{
-					Text = T("Enums.SmartStore.Core.Search.Facets.FacetDescriptor.Sorting.ValueAsc"),
-					Value = ((int)FacetDescriptor.Sorting.ValueAsc).ToString()
-				}
-			};
-
 			model.AvailableSearchFields = new List<SelectListItem>
 			{
 				new SelectListItem { Text = T("Admin.Catalog.Products.Fields.ShortDescription"), Value = "shortdescription" },
@@ -1710,7 +1695,6 @@ public ActionResult Search(SearchSettingsModel model, FormCollection form)
 			settings.GlobalFilters = JsonConvert.SerializeObject(model.GlobalFilters);
 			settings.FilterMinHitCount = model.FilterMinHitCount;
 			settings.FilterMaxChoicesCount = model.FilterMaxChoicesCount;
-			settings.FilterOrderBy = model.FilterOrderBy;
 
 			StoreDependingSettings.UpdateSettings(settings, form, storeScope, Services.Settings);
 
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Settings/SearchSettingsModel.cs
@@ -43,9 +43,5 @@ public SearchSettingsModel()
 
 		[SmartResourceDisplayName("Admin.Configuration.Settings.Search.FilterMaxChoicesCount")]
 		public int FilterMaxChoicesCount { get; set; }
-
-		[SmartResourceDisplayName("Admin.Configuration.Settings.Search.FilterOrderBy")]
-		public FacetDescriptor.Sorting FilterOrderBy { get; set; }
-		public List<SelectListItem> AvailableFilterOrders { get; set; }
 	}
 }
diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Setting/Search.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Setting/Search.cshtml
@@ -159,16 +159,6 @@
 				@Html.ValidationMessageFor(model => model.FilterMaxChoicesCount)
 			</td>
 		</tr>
-		<tr>
-			<td class="adminTitle">
-				@Html.SmartLabelFor(model => model.FilterOrderBy)
-			</td>
-			<td class="adminData">
-				@Html.SettingOverrideCheckbox(model => Model.FilterOrderBy)
-				@Html.DropDownListFor(model => model.FilterOrderBy, Model.AvailableFilterOrders)
-				@Html.ValidationMessageFor(model => model.FilterOrderBy)
-			</td>
-		</tr>
 	</table>
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,6 @@ public enum ValueOperator`
`17`	`17`	`Or`
`18`	`18`	`}`
`19`	`19`
`20`		`- public enum Sorting`
`21`		`- {`
`22`		`- HitsDesc,`
`23`		`- ValueAsc`
`24`		`- }`
`25`		`-`
`26`	`20`	`private readonly List<FacetValue> _values;`
`27`	`21`
`28`	`22`	`public FacetDescriptor(string key)`
`@@ -93,7 +87,7 @@ public int MaxChoicesCount`
`93`	`87`	`/// <summary>`
`94`	`88`	`/// Gets or sets the result choices sort order.`
`95`	`89`	`/// </summary>`
`96`		`- public Sorting OrderBy`
	`90`	`+ public FacetSorting OrderBy`
`97`	`91`	`{`
`98`	`92`	`get;`
`99`	`93`	`set;`
`@@ -118,13 +112,21 @@ public override string ToString()`
`118`	`112`	`}`
`119`	`113`
`120`	`114`
	`115`	`+ public enum FacetSorting`
	`116`	`+ {`
	`117`	`+ HitsDesc,`
	`118`	`+ ValueAsc,`
	`119`	`+ DisplayOrder`
	`120`	`+ }`
	`121`	`+`
	`122`	`+`
`121`	`123`	`public static class FacetDescriptorExtensions`
`122`	`124`	`{`
`123`		`- public static IOrderedEnumerable<Facet> OrderBy(this IEnumerable<Facet> source, FacetDescriptor.Sorting sorting)`
	`125`	`+ public static IOrderedEnumerable<Facet> OrderBy(this IEnumerable<Facet> source, FacetSorting sorting)`
`124`	`126`	`{`
`125`	`127`	`Guard.NotNull(source, nameof(source));`
`126`	`128`
`127`		`- if (sorting == FacetDescriptor.Sorting.HitsDesc)`
	`129`	`+ if (sorting == FacetSorting.HitsDesc)`
`128`	`130`	`{`
`129`	`131`	`return source.OrderByDescending(x => x.HitCount);`
`130`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using SmartStore.Core.Configuration;`
`3`		`-using SmartStore.Core.Search.Facets;`
`4`	`3`
`5`	`4`	`namespace SmartStore.Core.Search`
`6`	`5`	`{`
`@@ -16,7 +15,6 @@ public SearchSettings()`
`16`	`15`	`InstantSearchTermMinLength = 2;`
`17`	`16`	`FilterMinHitCount = 1;`
`18`	`17`	`FilterMaxChoicesCount = 20;`
`19`		`- FilterOrderBy = FacetDescriptor.Sorting.HitsDesc;`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`/// <summary>`
`@@ -64,11 +62,6 @@ public SearchSettings()`
`64`	`62`	`/// </summary>`
`65`	`63`	`public int FilterMaxChoicesCount { get; set; }`
`66`	`64`
`67`		`- /// <summary>`
`68`		`- /// Gets or sets the filter value order`
`69`		`- /// </summary>`
`70`		`- public FacetDescriptor.Sorting FilterOrderBy { get; set; }`
`71`		`-`
`72`	`65`	`// TBD: what about area specific searchin setting (product, blog, etc.)`
`73`	`66`	`}`
`74`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public SpecificationAttributeMap()`
`10`	`10`	`this.ToTable("SpecificationAttribute");`
`11`	`11`	`this.HasKey(sa => sa.Id);`
`12`	`12`	`this.Property(sa => sa.Name).IsRequired();`
`13`		`- this.Property(sa => sa.Alias).HasMaxLength(100);`
	`13`	`+ this.Property(sa => sa.Alias).HasMaxLength(30);`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,14 @@ public partial class SpecificationAttributeAlias : DbMigration`
`7`	`7`	`{`
`8`	`8`	`public override void Up()`
`9`	`9`	`{`
`10`		`- AddColumn("dbo.SpecificationAttributeOption", "Alias", c => c.String(maxLength: 100));`
`11`		`- AddColumn("dbo.SpecificationAttribute", "Alias", c => c.String(maxLength: 100));`
	`10`	`+ AddColumn("dbo.SpecificationAttributeOption", "Alias", c => c.String(maxLength: 30));`
	`11`	`+ AddColumn("dbo.SpecificationAttribute", "Alias", c => c.String(maxLength: 30));`
	`12`	`+ AddColumn("dbo.SpecificationAttribute", "FacetSorting", c => c.Int(nullable: false));`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`public override void Down()`
`15`	`16`	`{`
	`17`	`+ DropColumn("dbo.SpecificationAttribute", "FacetSorting");`
`16`	`18`	`DropColumn("dbo.SpecificationAttribute", "Alias");`
`17`	`19`	`DropColumn("dbo.SpecificationAttributeOption", "Alias");`
`18`	`20`	`}`