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

#17775: Checking if a theme exists before applying it.

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Andre Rodrigues
2011-05-02 14:47:19 -07:00
parent 657c762d84
commit 8c67c9f386
2 changed files with 85 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,80 +66,77 @@ namespace Orchard.Themes.Controllers {
public ILogger Logger { get; set; } public ILogger Logger { get; set; }
public ActionResult Index() { public ActionResult Index() {
try { bool installThemes = _featureManager.GetEnabledFeatures().FirstOrDefault(f => f.Id == "PackagingServices") != null;
bool installThemes = _featureManager.GetEnabledFeatures().FirstOrDefault(f => f.Id == "PackagingServices") != null;
var featuresThatNeedUpdate = _dataMigrationManager.GetFeaturesThatNeedUpdate(); var featuresThatNeedUpdate = _dataMigrationManager.GetFeaturesThatNeedUpdate();
ThemeEntry currentTheme = new ThemeEntry(_siteThemeService.GetSiteTheme()); ThemeEntry currentTheme = new ThemeEntry(_siteThemeService.GetSiteTheme());
IEnumerable<ThemeEntry> themes = _extensionManager.AvailableExtensions() IEnumerable<ThemeEntry> themes = _extensionManager.AvailableExtensions()
.Where(extensionDescriptor => { .Where(extensionDescriptor => {
bool hidden = false; bool hidden = false;
string tags = extensionDescriptor.Tags; string tags = extensionDescriptor.Tags;
if (tags != null) { if (tags != null) {
hidden = tags.Split(',').Any(t => t.Trim().Equals("hidden", StringComparison.OrdinalIgnoreCase)); hidden = tags.Split(',').Any(t => t.Trim().Equals("hidden", StringComparison.OrdinalIgnoreCase));
}
return !hidden &&
DefaultExtensionTypes.IsTheme(extensionDescriptor.ExtensionType) &&
!currentTheme.Descriptor.Id.Equals(extensionDescriptor.Id);
})
.Select(extensionDescriptor => {
ThemeEntry themeEntry = new ThemeEntry(extensionDescriptor) {
NeedsUpdate = featuresThatNeedUpdate.Contains(extensionDescriptor.Id),
IsRecentlyInstalled = _themeService.IsRecentlyInstalled(extensionDescriptor),
Enabled = _shellDescriptor.Features.Any(sf => sf.Name == extensionDescriptor.Id),
CanUninstall = installThemes
};
if (_extensionDisplayEventHandler != null) {
foreach (string notification in _extensionDisplayEventHandler.Displaying(themeEntry.Descriptor, ControllerContext.RequestContext))
{
themeEntry.Notifications.Add(notification);
} }
}
return !hidden && return themeEntry;
DefaultExtensionTypes.IsTheme(extensionDescriptor.ExtensionType) && })
!currentTheme.Descriptor.Id.Equals(extensionDescriptor.Id); .ToArray();
})
.Select(extensionDescriptor => {
ThemeEntry themeEntry = new ThemeEntry(extensionDescriptor) {
NeedsUpdate = featuresThatNeedUpdate.Contains(extensionDescriptor.Id),
IsRecentlyInstalled = _themeService.IsRecentlyInstalled(extensionDescriptor),
Enabled = _shellDescriptor.Features.Any(sf => sf.Name == extensionDescriptor.Id),
CanUninstall = installThemes
};
if (_extensionDisplayEventHandler != null) { return View(new ThemesIndexViewModel {
foreach (string notification in _extensionDisplayEventHandler.Displaying(themeEntry.Descriptor, ControllerContext.RequestContext)) CurrentTheme = currentTheme,
{ InstallThemes = installThemes,
themeEntry.Notifications.Add(notification); Themes = themes
} });
}
return themeEntry;
})
.ToArray();
return View(new ThemesIndexViewModel {
CurrentTheme = currentTheme,
InstallThemes = installThemes,
Themes = themes
});
} catch (Exception exception) {
this.Error(exception, T("Listing themes failed: {0}", exception.Message), Logger, Services.Notifier);
return View(new ThemesIndexViewModel());
}
} }
[HttpPost, FormValueAbsent("submit.Apply"), FormValueAbsent("submit.Cancel")] [HttpPost, FormValueAbsent("submit.Apply"), FormValueAbsent("submit.Cancel")]
public ActionResult Preview(string themeName, string returnUrl) { public ActionResult Preview(string themeName, string returnUrl) {
try { if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't preview the current theme")))
if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't preview the current theme"))) return new HttpUnauthorizedResult();
return new HttpUnauthorizedResult();
if (_extensionManager.AvailableExtensions()
.FirstOrDefault(extension => DefaultExtensionTypes.IsTheme(extension.ExtensionType) && extension.Name.Equals(themeName)) == null) {
Services.Notifier.Error(T("Theme {0} was not found", themeName));
} else {
_themeService.EnableThemeFeatures(themeName); _themeService.EnableThemeFeatures(themeName);
_previewTheme.SetPreviewTheme(themeName); _previewTheme.SetPreviewTheme(themeName);
return this.RedirectLocal(returnUrl, "~/");
} catch (Exception exception) {
this.Error(exception, T("Previewing theme failed: {0}", exception.Message), Logger, Services.Notifier);
return RedirectToAction("Index");
} }
return this.RedirectLocal(returnUrl, "~/");
} }
[HttpPost, ActionName("Preview"), FormValueRequired("submit.Apply")] [HttpPost, ActionName("Preview"), FormValueRequired("submit.Apply")]
public ActionResult ApplyPreview(string themeName, string returnUrl) { public ActionResult ApplyPreview(string themeName, string returnUrl) {
try { if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't preview the current theme")))
if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't preview the current theme"))) return new HttpUnauthorizedResult();
return new HttpUnauthorizedResult();
if (_extensionManager.AvailableExtensions()
.FirstOrDefault(extension => DefaultExtensionTypes.IsTheme(extension.ExtensionType) && extension.Name.Equals(themeName)) == null) {
Services.Notifier.Error(T("Theme {0} was not found", themeName));
} else {
_previewTheme.SetPreviewTheme(null); _previewTheme.SetPreviewTheme(null);
_siteThemeService.SetSiteTheme(themeName); _siteThemeService.SetSiteTheme(themeName);
} catch (Exception exception) {
this.Error(exception, T("Previewing theme failed: {0}", exception.Message), Logger, Services.Notifier);
} }
return RedirectToAction("Index"); return RedirectToAction("Index");
@@ -147,53 +144,60 @@ namespace Orchard.Themes.Controllers {
[HttpPost, ActionName("Preview"), FormValueRequired("submit.Cancel")] [HttpPost, ActionName("Preview"), FormValueRequired("submit.Cancel")]
public ActionResult CancelPreview(string returnUrl) { public ActionResult CancelPreview(string returnUrl) {
try { if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't preview the current theme")))
if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't preview the current theme"))) return new HttpUnauthorizedResult();
return new HttpUnauthorizedResult();
_previewTheme.SetPreviewTheme(null); _previewTheme.SetPreviewTheme(null);
} catch (Exception exception) {
this.Error(exception, T("Previewing theme failed: {0}", exception.Message), Logger, Services.Notifier);
}
return RedirectToAction("Index"); return RedirectToAction("Index");
} }
[HttpPost] [HttpPost]
public ActionResult Enable(string themeName) { public ActionResult Enable(string themeName) {
try { if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't enable the theme")))
if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't enable the theme"))) return new HttpUnauthorizedResult();
return new HttpUnauthorizedResult();
if (_extensionManager.AvailableExtensions()
.FirstOrDefault(extension => DefaultExtensionTypes.IsTheme(extension.ExtensionType) && extension.Name.Equals(themeName)) == null) {
Services.Notifier.Error(T("Theme {0} was not found", themeName));
} else {
_themeService.EnableThemeFeatures(themeName); _themeService.EnableThemeFeatures(themeName);
} catch (Exception exception) {
this.Error(exception, T("Enabling theme failed: {0}", exception.Message), Logger, Services.Notifier);
} }
return RedirectToAction("Index"); return RedirectToAction("Index");
} }
[HttpPost] [HttpPost]
public ActionResult Disable(string themeName) { public ActionResult Disable(string themeName) {
try { if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't disable the current theme")))
if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't disable the current theme"))) return new HttpUnauthorizedResult();
return new HttpUnauthorizedResult();
if (_extensionManager.AvailableExtensions()
.FirstOrDefault(extension => DefaultExtensionTypes.IsTheme(extension.ExtensionType) && extension.Name.Equals(themeName)) == null) {
Services.Notifier.Error(T("Theme {0} was not found", themeName));
} else {
_themeService.DisableThemeFeatures(themeName); _themeService.DisableThemeFeatures(themeName);
} catch (Exception exception) {
this.Error(exception, T("Disabling theme failed: {0}", exception.Message), Logger, Services.Notifier);
} }
return RedirectToAction("Index"); return RedirectToAction("Index");
} }
[HttpPost] [HttpPost]
public ActionResult Activate(string themeName) { public ActionResult Activate(string themeName) {
try { if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't set the current theme")))
if (!Services.Authorizer.Authorize(Permissions.ApplyTheme, T("Couldn't set the current theme"))) return new HttpUnauthorizedResult();
return new HttpUnauthorizedResult();
if (_extensionManager.AvailableExtensions()
.FirstOrDefault(extension => DefaultExtensionTypes.IsTheme(extension.ExtensionType) && extension.Name.Equals(themeName)) == null) {
Services.Notifier.Error(T("Theme {0} was not found", themeName));
} else {
_themeService.EnableThemeFeatures(themeName); _themeService.EnableThemeFeatures(themeName);
_siteThemeService.SetSiteTheme(themeName); _siteThemeService.SetSiteTheme(themeName);
} catch (Exception exception) {
this.Error(exception, T("Activating theme failed: {0}", exception.Message), Logger, Services.Notifier);
} }
return RedirectToAction("Index"); return RedirectToAction("Index");
} }

4
src/Orchard.Web/Modules/Orchard.Themes/Models/ThemeEntry.cs
View File

@@ -9,7 +9,9 @@ namespace Orchard.Themes.Models {
/// <summary> /// <summary>
/// Default constructor. /// Default constructor.
/// </summary> /// </summary>
public ThemeEntry() {} public ThemeEntry() {
Notifications = new List<string>();
}
/// <summary> /// <summary>
/// Instantiates a theme based on an extension descriptor. /// Instantiates a theme based on an extension descriptor.