Minor changes - Admin search

HongJunRen · Sep 17, 2018 · 4dd8fa2 · 4dd8fa2
1 parent 06bc1a3
commit 4dd8fa2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/Grand.Web/Areas/Admin/Controllers/AdminSearchController.cs b/Grand.Web/Areas/Admin/Controllers/AdminSearchController.cs
@@ -28,10 +28,11 @@ public class AdminSearchController : BaseAdminController
         private readonly IOrderService _orderService;
         private readonly AdminSearchSettings _adminSearchSettings;
         private readonly ILocalizationService _localizationService;
+        private readonly IWorkContext _workContext;
 
         public AdminSearchController(IProductService productService, ICategoryService categoryService, IManufacturerService manufacturerService,
             ITopicService topicService, INewsService newsService, IBlogService blogService, ICustomerService customerService, IOrderService orderService,
-            AdminSearchSettings adminSearchSettings, ILocalizationService localizationService)
+            AdminSearchSettings adminSearchSettings, ILocalizationService localizationService, IWorkContext workContext)
         {
             this._productService = productService;
             this._categoryService = categoryService;
@@ -43,6 +44,7 @@ public AdminSearchController(IProductService productService, ICategoryService ca
             this._orderService = orderService;
             this._adminSearchSettings = adminSearchSettings;
             this._localizationService = localizationService;
+            this._workContext = workContext;
         }
 
         [HttpPost]
@@ -51,6 +53,10 @@ public IActionResult Search(string searchTerm, FoundMenuItem[] foundMenuItems)
             if (string.IsNullOrEmpty(searchTerm))
                 return Json("error");
 
+            if(!_workContext.CurrentCustomer.IsAdmin())
+            {
+                return Json("Access Denied");
+            }
             //object = actual result, int = display order for sorting
             List<Tuple<object, int>> result = new List<Tuple<object, int>>();
 

diff --git a/Grand.Web/Areas/Admin/Views/Shared/_AdminLayout.cshtml b/Grand.Web/Areas/Admin/Views/Shared/_AdminLayout.cshtml
@@ -208,14 +208,17 @@
                     </ul>
                 </div>
             </div>
-            <div class="input-group">
-                <input id="searchInput" type="text" class="form-control" placeholder="@T("AdminSearch.Placehloder")">
-                <script>
-                    $(document).ready(function () {
-                        Admin.Search.init("@(Url.Action("Search", "AdminSearch"))");
-                    });
-                </script>
-            </div>
+            @if (currentCustomer.IsAdmin())
+            {
+                <div class="input-group admin-search-input-container">
+                    <input id="searchInput" type="text" class="form-control" placeholder="@T("AdminSearch.Placehloder")">
+                    <script>
+                        $(document).ready(function () {
+                            Admin.Search.init("@(Url.Action("Search", "AdminSearch"))");
+                        });
+                    </script>
+                </div>
+            }
         </div>
     }
     @await Component.InvokeAsync("AdminWidget", new { widgetZone = "admin_header_after" })

diff --git a/Grand.Web/wwwroot/Administration/styles.css b/Grand.Web/wwwroot/Administration/styles.css
@@ -487,8 +487,13 @@ textarea.form-control.k-input {
     margin: 0;
 }
 
+.admin-search-input-container {
+    display: flex;
+    max-width: 500px;
+    width: auto;
+}
+
 #searchInput {
-    width: 500px;
     margin: 10px;
 }