mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-21 11:17:28 +08:00
Replacing Module/Theme/Core strings.
--HG-- branch : dev
This commit is contained in:
@@ -5,6 +5,7 @@ using System.Web.Mvc;
|
||||
using Orchard.Data.Migration;
|
||||
using Orchard.Environment.Descriptor.Models;
|
||||
using Orchard.Environment.Extensions;
|
||||
using Orchard.Environment.Extensions.Models;
|
||||
using Orchard.Environment.Features;
|
||||
using Orchard.Localization;
|
||||
using Orchard.Reports.Services;
|
||||
@@ -58,7 +59,7 @@ namespace Orchard.Themes.Controllers {
|
||||
var featuresThatNeedUpdate = _dataMigrationManager.GetFeaturesThatNeedUpdate();
|
||||
|
||||
var themes = _extensionManager.AvailableExtensions()
|
||||
.Where(d => d.ExtensionType == "Theme")
|
||||
.Where(d => d.ExtensionType == DefaultExtensionTypes.Theme)
|
||||
.Select(d => new ThemeEntry {
|
||||
Descriptor = d,
|
||||
NeedsUpdate = featuresThatNeedUpdate.Contains(d.Id),
|
||||
|
@@ -1,25 +1,22 @@
|
||||
using System.Linq;
|
||||
using System.Web.Mvc;
|
||||
using Orchard.DisplayManagement;
|
||||
using Orchard.Environment.Extensions.Models;
|
||||
using Orchard.Environment.Features;
|
||||
using Orchard.Mvc.Filters;
|
||||
using Orchard.Themes.ViewModels;
|
||||
|
||||
namespace Orchard.Themes.Preview {
|
||||
public class PreviewThemeFilter : FilterProvider, IResultFilter {
|
||||
private readonly IThemeManager _themeManager;
|
||||
private readonly IPreviewTheme _previewTheme;
|
||||
private readonly IWorkContextAccessor _workContextAccessor;
|
||||
private readonly dynamic _shapeFactory;
|
||||
private readonly IFeatureManager _featureManager;
|
||||
|
||||
public PreviewThemeFilter(
|
||||
IThemeManager themeManager,
|
||||
IPreviewTheme previewTheme,
|
||||
IWorkContextAccessor workContextAccessor,
|
||||
IShapeFactory shapeFactory,
|
||||
IFeatureManager featureManager) {
|
||||
_themeManager = themeManager;
|
||||
_previewTheme = previewTheme;
|
||||
_workContextAccessor = workContextAccessor;
|
||||
_shapeFactory = shapeFactory;
|
||||
@@ -33,7 +30,7 @@ namespace Orchard.Themes.Preview {
|
||||
|
||||
var installedThemes = _featureManager.GetEnabledFeatures()
|
||||
.Select(x => x.Extension)
|
||||
.Where(x => x.ExtensionType == "Theme")
|
||||
.Where(x => x.ExtensionType == DefaultExtensionTypes.Theme)
|
||||
.Distinct();
|
||||
|
||||
var themeListItems = installedThemes
|
||||
|
@@ -110,7 +110,7 @@ namespace Orchard.Themes.Services {
|
||||
var themes = new List<ExtensionDescriptor>();
|
||||
foreach (var descriptor in extensions) {
|
||||
|
||||
if (!string.Equals(descriptor.ExtensionType, "Theme", StringComparison.OrdinalIgnoreCase)) {
|
||||
if (!string.Equals(descriptor.ExtensionType, DefaultExtensionTypes.Theme, StringComparison.OrdinalIgnoreCase)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user