#17179: Fixing YSOD, centralizing duplicate code and renaming css class to a more appropriate name.

--HG--
branch : 1.x

src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs

@@ -6,8 +6,10 @@ using System.Web.Hosting;
 using System.Web.Mvc;
 using System.Xml.Linq;
 using Orchard.Environment.Extensions;
+using Orchard.Environment.Extensions.Models;
 using Orchard.Localization;
 using Orchard.Logging;
+using Orchard.Packaging.Models;
 using Orchard.Packaging.Services;
 using Orchard.Packaging.ViewModels;
 using Orchard.Security;
@@ -113,7 +115,15 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public ActionResult Modules(int? sourceId) {
-            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list modules")))
+            return ListExtensions(sourceId, DefaultExtensionTypes.Module, "Modules", source => _packagingSourceManager.GetModuleList(source).ToArray());
+        }
+
+        public ActionResult Themes(int? sourceId) {
+            return ListExtensions(sourceId, DefaultExtensionTypes.Theme, "Themes", source => _packagingSourceManager.GetThemeList(source).ToArray());
+        }
+
+        protected ActionResult ListExtensions(int? sourceId, string extensionType, string returnView, Func<PackagingSource, PackagingEntry[]> getList) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list {0}", extensionType)))
                 return new HttpUnauthorizedResult();
 
             var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault();
@@ -126,40 +136,21 @@ namespace Orchard.Packaging.Controllers {
             IEnumerable<PackagingEntry> extensions = null;
             foreach (var source in sources) {
                 try {
-                    var sourceExtensions = _packagingSourceManager.GetModuleList(source).ToArray();
+                    var sourceExtensions = getList(source);
                     extensions = extensions == null ? sourceExtensions : extensions.Concat(sourceExtensions);
-                }
+                } catch (Exception ex) {
-                catch (Exception ex) {
                     Logger.Error(ex, "Error loading extensions from gallery source '{0}'. {1}.", source.FeedTitle, ex.Message);
                     _notifier.Error(T("Error loading extensions from gallery source '{0}'. {1}.", source.FeedTitle, ex.Message));
                 }
             }
 
-            return View("Modules", new PackagingExtensionsViewModel {
+            return View(returnView, new PackagingExtensionsViewModel {
                 Extensions = extensions ?? new PackagingEntry[] { },
                 Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle),
                 SelectedSource = selectedSource
             });
         }
 
-        public ActionResult Themes(int? sourceId) {
-            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list themes")))
-                return new HttpUnauthorizedResult();
-
-            var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault();
-
-            var sources = selectedSource != null
-                ? new[] { selectedSource }
-                : _packagingSourceManager.GetSources()
-            ;
-
-            return View("Themes", new PackagingExtensionsViewModel {
-                Extensions = sources.SelectMany(source => _packagingSourceManager.GetThemeList(source)),
-                Sources = _packagingSourceManager.GetSources().OrderBy(s => s.FeedTitle),
-                SelectedSource = selectedSource
-            });
-        }
-
         public ActionResult Install(string packageId, string version, int sourceId, string redirectTo) {
             if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to install packages")))
                 return new HttpUnauthorizedResult();

src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css

@@ -1,16 +1,13 @@
-.moduleName {
+.extensionName {
     float:left;
 }
-    
 .contentItems .related {
     padding:1.2em 0.4em 0.5em
 }
-
 .contentItems .properties {
     float:none;
     clear:both;
 }
-
 .contentItems .pageStatus {
     margin:.8em 0;
     color:#666;

src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.cshtml

@@ -22,7 +22,7 @@
     <ul class="contentItems">
     @foreach (var item in Model.Extensions) {
         <li>
-            <div class="moduleName">
+            <div class="extensionName">
                 <h2>@item.Title<span> - @T("Version: {0}", item.Version)</span></h2>
             </div>
 

src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml

@@ -22,7 +22,7 @@
     <ul class="contentItems">
     @foreach (var item in Model.Extensions) {
         <li>
-            <div class="moduleName">
+            <div class="extensionName">
                 <h2>@item.Title<span> - @T("Version: {0}", item.Version)</span></h2>
             </div>