nopSolutions#3719 Allow to change plugin display order at runtime

grahamehorner · Apr 29, 2019 · 5bf594f · 5bf594f
1 parent e444b9e
commit 5bf594f
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/Libraries/Nop.Services/Plugins/PluginService.cs b/src/Libraries/Nop.Services/Plugins/PluginService.cs
@@ -154,10 +154,13 @@ public virtual IEnumerable<PluginDescriptor> GetPluginDescriptors<TPlugin>(LoadP
 
             //filter by the passed type
             if (typeof(TPlugin) != typeof(IPlugin))
-                pluginDescriptors = pluginDescriptors.Where(descriptor => typeof(TPlugin).IsAssignableFrom(descriptor.PluginType));
-
-            //order by group name
-            pluginDescriptors = pluginDescriptors.OrderBy(descriptor => descriptor.Group).ToList();
+            {
+                pluginDescriptors = pluginDescriptors
+                    .Where(descriptor => typeof(TPlugin).IsAssignableFrom(descriptor.PluginType))
+                    .OrderBy(descriptor => descriptor.DisplayOrder);
+            }
+            else
+                pluginDescriptors = pluginDescriptors.OrderBy(descriptor => descriptor.Group);
 
             return pluginDescriptors;
         }
@@ -245,7 +248,7 @@ public virtual string GetPluginLogoUrl(PluginDescriptor pluginDescriptor)
         public virtual void PreparePluginToInstall(string systemName, Customer customer = null)
         {
             //add plugin name to the appropriate list (if not yet contained) and save changes
-            if (_pluginsInfo.PluginNamesToInstall.Any(item => item.SystemName == systemName)) 
+            if (_pluginsInfo.PluginNamesToInstall.Any(item => item.SystemName == systemName))
                 return;
 
             _pluginsInfo.PluginNamesToInstall.Add((systemName, customer?.CustomerGuid));
@@ -276,7 +279,7 @@ public virtual void PreparePluginToUninstall(string systemName)
         public virtual void PreparePluginToDelete(string systemName)
         {
             //add plugin name to the appropriate list (if not yet contained) and save changes
-            if (_pluginsInfo.PluginNamesToDelete.Contains(systemName)) 
+            if (_pluginsInfo.PluginNamesToDelete.Contains(systemName))
                 return;
 
             _pluginsInfo.PluginNamesToDelete.Add(systemName);