From 2a25dcd159bd99f2d59534757515b9507586a91f Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Thu, 30 Aug 2018 10:31:50 +0300
Subject: [PATCH] Added order to toolbar item.

---
 .../Themes/Basic/Components/Toolbar/Default.cshtml          | 2 +-
 .../Toolbars/ToolbarItem.cs                                 | 5 ++++-
 .../Toolbars/ToolbarManager.cs                              | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/Default.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/Default.cshtml
index bf5f7bcb66..87a7a645f0 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/Default.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/Default.cshtml
@@ -1,6 +1,6 @@
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
 @model Toolbar
-@foreach (var toolbarItem in Model.Items)
+@foreach (var toolbarItem in Model.Items.OrderBy(i => i.Order))
 {
     <span>@(await Component.InvokeAsync(toolbarItem.ComponentType))</span>
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarItem.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarItem.cs
index 6f735f5824..9b6ef4becb 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarItem.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarItem.cs
@@ -12,8 +12,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
         }
         private Type _componentType;
 
-        public ToolbarItem([NotNull] Type componentType)
+        public int Order { get; set; }
+
+        public ToolbarItem([NotNull] Type componentType, int order = 0)
         {
+            Order = order;
             ComponentType = Check.NotNull(componentType, nameof(componentType));
         }
     }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs
index 3838231464..77fbd67534 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs
@@ -25,11 +25,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
 
         public async Task<Toolbar> GetAsync(string name)
         {
-            var menu = new Toolbar(name);
+            var toolbar = new Toolbar(name);
 
             using (var scope = ServiceProvider.CreateScope())
             {
-                var context = new ToolbarConfigurationContext(ThemeManager.CurrentTheme, menu, scope.ServiceProvider);
+                var context = new ToolbarConfigurationContext(ThemeManager.CurrentTheme, toolbar, scope.ServiceProvider);
 
                 foreach (var contributor in Options.Contributors)
                 {
@@ -37,7 +37,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars
                 }
             }
 
-            return menu;
+            return toolbar;
         }
     }
 }
\ No newline at end of file