lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 20:16:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#17925: Setup service was still setting the current theme to be the theme machine. Not doing that. Recipes explicitly set the current theme. Fixing small issue on themes page if no theme is set. Extending safe theme to include minimum zones to make the core recipe homepage look "decent" / usable.

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Andre Rodrigues
2011-06-09 15:36:03 -07:00
parent 6e25797b28
commit 4521f0d1c4
5 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
View File

@@ -69,7 +69,13 @@ namespace Orchard.Themes.Controllers {
bool installThemes = _featureManager.GetEnabledFeatures().FirstOrDefault(f => f.Id == "PackagingServices") != null;
var featuresThatNeedUpdate = _dataMigrationManager.GetFeaturesThatNeedUpdate();
ThemeEntry currentTheme = new ThemeEntry(_siteThemeService.GetSiteTheme());
ThemeEntry currentTheme = null;
ExtensionDescriptor currentThemeDescriptor = _siteThemeService.GetSiteTheme();
if (currentThemeDescriptor != null) {
currentTheme = new ThemeEntry(currentThemeDescriptor);
}
IEnumerable<ThemeEntry> themes = _extensionManager.AvailableExtensions()
.Where(extensionDescriptor => {
bool hidden = false;
@@ -80,7 +86,8 @@ namespace Orchard.Themes.Controllers {
return !hidden &&
DefaultExtensionTypes.IsTheme(extensionDescriptor.ExtensionType) &&
!currentTheme.Descriptor.Id.Equals(extensionDescriptor.Id);
(currentTheme == null ||
!currentTheme.Descriptor.Id.Equals(extensionDescriptor.Id));
})
.Select(extensionDescriptor => {
ThemeEntry themeEntry = new ThemeEntry(extensionDescriptor) {