Resolves #1172 Search: Option to display related search terms on sear…

…ch page
smartstore · Sep 20, 2018 · 7875f39 · 7875f39
1 parent 21b31ea
commit 7875f39
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 24 deletions.
diff --git a/changelog.md b/changelog.md
@@ -16,7 +16,9 @@
 * Added option to add multiple file versions to product download section
 * Added options for alternating price display (in badges)
 * Added option to display a captcha on forum pages when creating or replying to a topic.
-* MegaSearch: Supports searching for forum posts.
+* **MegaSearch**:
+	* Supports searching for forum posts.
+	* #1172 Option to display related search terms on search page.
 * Customer avatar: Letter with colored background if no avatar image was uploaded.
 * Viveum: Supports payment via "Virtual Account Brands" like PayPal.
 

diff --git a/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs b/src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs
@@ -505,6 +505,10 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
             builder.AddOrUpdate("Admin.Catalog.Products.BundleItems.NoProductLinkageForBundleItem",
                 "The type cannot be changed to \"Product\" because the product \"{0}\" is bundle item of a product bundle.",
                 "Der Typ kann nicht in \"Produkt\" geändert werden, weil das Produkt \"{0}\" auf der Stückliste eines Produkt-Bundle steht.");
+
+            builder.AddOrUpdate("Search.RelatedSearchTerms",
+                "Related search terms",
+                "Verwandte Suchbegriffe");
         }
     }
 }
diff --git a/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs b/src/Presentation/SmartStore.Web/Controllers/BoardsController.cs
@@ -1802,8 +1802,6 @@ public ActionResult Search(ForumSearchQuery query)
 
             PrepareSearchResult(model, null);
 
-            model.AddSpellCheckerSuggestions(model.SearchResult.SpellCheckerSuggestions, T, x => Url.RouteUrl("BoardSearch", new { q = x }));
-
             return View(model);
         }
 

diff --git a/src/Presentation/SmartStore.Web/Controllers/SearchController.cs b/src/Presentation/SmartStore.Web/Controllers/SearchController.cs
@@ -70,9 +70,11 @@ public ActionResult SearchBox()
 
 		[HttpPost, ValidateInput(false)]
 		public ActionResult InstantSearch(CatalogSearchQuery query)
-		{		
-			if (string.IsNullOrWhiteSpace(query.Term) || query.Term.Length < _searchSettings.InstantSearchTermMinLength)
-				return Content(string.Empty);
+		{
+            if (string.IsNullOrWhiteSpace(query.Term) || query.Term.Length < _searchSettings.InstantSearchTermMinLength)
+            {
+                return Content(string.Empty);
+            }
 
 			query
 				.BuildFacetMap(false)
@@ -97,12 +99,10 @@ public ActionResult InstantSearch(CatalogSearchQuery query)
 			mappingSettings.MapPictures = _searchSettings.ShowProductImagesInInstantSearch;
 			mappingSettings.ThumbnailSize = _mediaSettings.ProductThumbPictureSizeOnProductDetailsPage;
 
-			var summaryModel = _catalogHelper.MapProductSummaryModel(result.Hits, mappingSettings);
-
-			// Add product hits
-			model.TopProducts = summaryModel;
+			// Add product hits.
+			model.TopProducts = _catalogHelper.MapProductSummaryModel(result.Hits, mappingSettings);
 
-            // Add spell checker suggestions (if any)
+            // Add spell checker suggestions (if any).
             model.AddSpellCheckerSuggestions(result.SpellCheckerSuggestions, T, x => Url.RouteUrl("Search", new { q = x }));
 
             return PartialView(model);
@@ -131,9 +131,9 @@ public ActionResult Search(CatalogSearchQuery query)
 			{
 				result = _catalogSearchService.Search(query);
 			}
-			catch (Exception exception)
+			catch (Exception ex)
 			{
-				model.Error = exception.ToString();
+				model.Error = ex.ToString();
 				result = new CatalogSearchResult(query);
 			}
 
@@ -166,15 +166,12 @@ public ActionResult Search(CatalogSearchQuery query)
 			var mappingSettings = _catalogHelper.GetBestFitProductSummaryMappingSettings(query.GetViewMode());
 			var summaryModel = _catalogHelper.MapProductSummaryModel(result.Hits, mappingSettings);
 
-			// Prepare paging/sorting/mode stuff
+			// Prepare paging/sorting/mode stuff.
 			_catalogHelper.MapListActions(summaryModel, null, _catalogSettings.DefaultPageSizeOptions);
 
-			// Add product hits
+			// Add product hits.
 			model.TopProducts = summaryModel;
 
-			// Add spell checker suggestions (if any)
-            model.AddSpellCheckerSuggestions(result.SpellCheckerSuggestions, T, x => Url.RouteUrl("Search", new { q = x }));
-
             return View(model);
 		}
 

diff --git a/src/Presentation/SmartStore.Web/Views/Boards/Search.cshtml b/src/Presentation/SmartStore.Web/Views/Boards/Search.cshtml
@@ -36,15 +36,15 @@
     </div>
 
     <div class="page-body">
-        <div class="search-input mt-4 mb-5">
+        <div class="search-input mt-4">
             @if (Model.AllowFiltering && Model.SearchResult.Facets.Any())
             {
                 <div class="mb-4">
                     @{ Html.RenderAction("Filters", new { model = Model }); }
                 </div>
             }
 
-            <div class="w-75 mb-2">
+            <div class="w-75 mb-4">
                 @{ Html.RenderAction("SearchBox", "Boards"); }
             </div>
 
@@ -68,10 +68,10 @@
 			    </div>
 		    }
 
-		    @if (suggestions.Any() && (Model.AttemptedTerm.HasValue() || Model.TotalCount == 0))
+		    @if (suggestions.Any())
 		    {
 			    <p class="search-suggestions">
-				    <strong>@T("Search.DidYouMean")</strong>
+				    <strong>@(T(Model.AttemptedTerm.HasValue() || Model.TotalCount == 0 ? "Search.DidYouMean" : "Search.RelatedSearchTerms")):</strong>
 				    @{ 
 					    var links = string.Join(", ", suggestions.Select(x => "<a href='" + Url.RouteUrl("BoardSearch", new { q = x }) + "'>{0}</a>".FormatCurrentUI(x)));
 				    }

diff --git a/src/Presentation/SmartStore.Web/Views/Search/Search.cshtml b/src/Presentation/SmartStore.Web/Views/Search/Search.cshtml
@@ -75,10 +75,10 @@
 			</div>
 		}
 
-		@if (suggestions.Any() && (Model.AttemptedTerm.HasValue() || Model.TotalProductsCount == 0))
+		@if (suggestions.Any())
 		{
 			<p class="search-suggestions">
-				<strong>@T("Search.DidYouMean")</strong>
+				<strong>@(T(Model.AttemptedTerm.HasValue() || Model.TotalProductsCount == 0 ? "Search.DidYouMean" : "Search.RelatedSearchTerms")):</strong>
 				@{ 
 					var links = String.Join(", ", suggestions.Select(x => "<a href='" + Url.RouteUrl("Search", new { q = x }) + "'>{0}</a>".FormatCurrentUI(x)));
 				}