From 4cda9282d72b9cc64673600308802480f6e54632 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 17 May 2010 09:50:36 -0700
Subject: [PATCH] A little cleanup in the feature management UI

--HG--
branch : dev
---
 .../Orchard.Modules/Controllers/AdminController.cs        | 8 +++-----
 .../Modules/Orchard.Modules/Services/ModuleService.cs     | 7 +++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
index 88a49866a..f810492d4 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using System.Reflection;
 using System.Web.Mvc;
 using Orchard.Localization;
@@ -26,7 +24,7 @@ namespace Orchard.Modules.Controllers {
             if (!Services.Authorizer.Authorize(Permissions.ManageModules, T("Not allowed to manage modules")))
                 return new HttpUnauthorizedResult();
 
-            var modules = _moduleService.GetInstalledModules();
+            var modules = _moduleService.GetInstalledModules().ToList();
             return View(new ModulesIndexViewModel {Modules = modules});
         }
 
@@ -48,7 +46,7 @@ namespace Orchard.Modules.Controllers {
             if (!Services.Authorizer.Authorize(Permissions.ManageFeatures, T("Not allowed to manage features")))
                 return new HttpUnauthorizedResult();
 
-            var features = _moduleService.GetAvailableFeatures();
+            var features = _moduleService.GetAvailableFeatures().ToList();
             return View(new FeaturesViewModel {Features = features});
         }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs b/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
index b396398a5..67307b434 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
@@ -48,11 +48,10 @@ namespace Orchard.Modules.Services {
         }
 
         public IEnumerable<IModuleFeature> GetAvailableFeatures() {
-            var enabledFeatures = _shellDescriptorManager.GetShellDescriptor().EnabledFeatures.ToList();
+            var enabledFeatures = _shellDescriptorManager.GetShellDescriptor().EnabledFeatures;
             return GetInstalledModules()
                 .SelectMany(m => _extensionManager.LoadFeatures(m.Features))
-                .Select(f => AssembleModuleFromDescriptor(f, enabledFeatures.FirstOrDefault(sf => string.Equals(sf.Name, f.Descriptor.Name, StringComparison.OrdinalIgnoreCase)) != null))
-                .ToList();
+                .Select(f => AssembleModuleFromDescriptor(f, enabledFeatures.FirstOrDefault(sf => string.Equals(sf.Name, f.Descriptor.Name, StringComparison.OrdinalIgnoreCase)) != null));
         }
 
         public IEnumerable<Feature> GetAvailableFeaturesByModule(string moduleName) {
@@ -71,7 +70,7 @@ namespace Orchard.Modules.Services {
         public void DisableFeatures(IEnumerable<string> featureNames) {
             var shellDescriptor = _shellDescriptorManager.GetShellDescriptor();
             var enabledFeatures = shellDescriptor.EnabledFeatures.ToList();
-            var features = GetAvailableFeatures();
+            var features = GetAvailableFeatures().ToList();
 
             foreach (var featureName in featureNames) {
                 var feature = featureName;