lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SiteSettings -> SiteSettingsPart

Browse Source 
- updating part names to conform to a <name>Part convention

--HG--
branch : dev
rename : src/Orchard.Web/Core/Settings/Drivers/SiteSettingsDriver.cs => src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs
rename : src/Orchard.Web/Core/Settings/Handlers/SiteSettingsHandler.cs => src/Orchard.Web/Core/Settings/Handlers/SiteSettingsPartHandler.cs
rename : src/Orchard.Web/Core/Settings/Models/SiteSettings.cs => src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs
rename : src/Orchard.Web/Core/Settings/Models/SiteSettingsRecord.cs => src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs
This commit is contained in:
Nathan Heskew
2010-07-23 01:09:00 -07:00
parent f482c738ec
commit 51e6dca391
11 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -193,14 +193,14 @@
<Compile Include="Scheduling\Models\Task.cs" />
<Compile Include="Settings\DataMigrations\SettingsDataMigration.cs" />
<Compile Include="Settings\ViewModels\SiteCulturesViewModel.cs" />
<Compile Include="Settings\Drivers\SiteSettingsDriver.cs" />
<Compile Include="Settings\Drivers\SiteSettingsPartDriver.cs" />
<Compile Include="Settings\Metadata\ContentDefinitionManager.cs" />
<Compile Include="Settings\Metadata\Records\ContentFieldDefinitionRecord.cs" />
<Compile Include="Settings\Metadata\Records\ContentPartDefinitionRecord.cs" />
<Compile Include="Settings\Metadata\Records\ContentPartFieldDefinitionRecord.cs" />
<Compile Include="Settings\Metadata\Records\ContentTypeDefinitionRecord.cs" />
<Compile Include="Settings\Metadata\Records\ContentTypePartDefinitionRecord.cs" />
<Compile Include="Settings\Models\SiteSettingsRecord.cs" />
<Compile Include="Settings\Models\SiteSettingsPartRecord.cs" />
<Compile Include="Settings\Permissions.cs" />
<Compile Include="Settings\State\Records\ShellFeatureStateRecord.cs" />
<Compile Include="Settings\State\Records\ShellStateRecord.cs" />
@@ -211,8 +211,8 @@
<Compile Include="Settings\Descriptor\ShellDescriptorManager.cs" />
<Compile Include="Settings\AdminMenu.cs" />
<Compile Include="Settings\Controllers\AdminController.cs" />
<Compile Include="Settings\Handlers\SiteSettingsHandler.cs" />
<Compile Include="Settings\Models\SiteSettings.cs" />
<Compile Include="Settings\Handlers\SiteSettingsPartHandler.cs" />
<Compile Include="Settings\Models\SiteSettingsPart.cs" />
<Compile Include="Settings\Services\SiteService.cs" />
<Compile Include="Settings\ViewModels\SettingsIndexViewModel.cs" />
<Compile Include="XmlRpc\Controllers\HomeController.cs" />

4
src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
View File

@@ -30,7 +30,7 @@ namespace Orchard.Core.Settings.Controllers {
return new HttpUnauthorizedResult();
var model = new SettingsIndexViewModel {
Site = _siteService.GetSiteSettings().As<SiteSettings>(),
Site = _siteService.GetSiteSettings().As<SiteSettingsPart>(),
SiteCultures = _cultureManager.ListCultures()
};
model.ViewModel = Services.ContentManager.BuildEditorModel(model.Site);
@@ -42,7 +42,7 @@ namespace Orchard.Core.Settings.Controllers {
if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings")))
return new HttpUnauthorizedResult();
var viewModel = new SettingsIndexViewModel { Site = _siteService.GetSiteSettings().As<SiteSettings>() };
var viewModel = new SettingsIndexViewModel { Site = _siteService.GetSiteSettings().As<SiteSettingsPart>() };
viewModel.ViewModel = Services.ContentManager.UpdateEditorModel(viewModel.Site.ContentItem, this);
if (!TryUpdateModel(viewModel)) {

2
src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs
View File

@@ -81,7 +81,7 @@ namespace Orchard.Core.Settings.DataMigrations {
);
//CREATE TABLE Settings_SiteSettingsRecord (Id INTEGER not null, SiteSalt TEXT, SiteName TEXT, SuperUser TEXT, PageTitleSeparator TEXT, HomePage TEXT, SiteCulture TEXT, primary key (Id));
SchemaBuilder.CreateTable("SiteSettingsRecord", table => table
SchemaBuilder.CreateTable("SiteSettingsPartRecord", table => table
.ContentPartRecord()
.Column<string>("SiteSalt")
.Column<string>("SiteName")

8
src/Orchard.Web/Core/Settings/Drivers/SiteSettingsDriver.cs → src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs
View File

@@ -5,15 +5,15 @@ using Orchard.Core.Settings.Models;
namespace Orchard.Core.Settings.Drivers {
[UsedImplicitly]
public class SiteSettingsDriver : ContentItemDriver<SiteSettings> {
public class SiteSettingsPartDriver : ContentItemDriver<SiteSettingsPart> {
protected override ContentType GetContentType() {
return SiteSettings.ContentType;
return SiteSettingsPart.ContentType;
}
protected override DriverResult Editor(SiteSettings part) {
protected override DriverResult Editor(SiteSettingsPart part) {
return ContentItemTemplate("Items/Settings.Site");
}
protected override DriverResult Editor(SiteSettings part, IUpdateModel updater) {
protected override DriverResult Editor(SiteSettingsPart part, IUpdateModel updater) {
return ContentItemTemplate("Items/Settings.Site");
}
}

6
src/Orchard.Web/Core/Settings/Handlers/SiteSettingsHandler.cs → src/Orchard.Web/Core/Settings/Handlers/SiteSettingsPartHandler.cs
View File

@@ -5,9 +5,9 @@ using Orchard.ContentManagement.Handlers;
namespace Orchard.Core.Settings.Handlers {
[UsedImplicitly]
public class SiteSettingsHandler : ContentHandler {
public SiteSettingsHandler(IRepository<SiteSettingsRecord> repository){
Filters.Add(new ActivatingFilter<SiteSettings>("Site"));
public class SiteSettingsPartHandler : ContentHandler {
public SiteSettingsPartHandler(IRepository<SiteSettingsPartRecord> repository){
Filters.Add(new ActivatingFilter<SiteSettingsPart>("Site"));
Filters.Add(StorageFilter.For(repository));
}
}

2
src/Orchard.Web/Core/Settings/Models/SiteSettings.cs → src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs
View File

@@ -2,7 +2,7 @@
using Orchard.Settings;
namespace Orchard.Core.Settings.Models {
public sealed class SiteSettings : ContentPart<SiteSettingsRecord>, ISite {
public sealed class SiteSettingsPart : ContentPart<SiteSettingsPartRecord>, ISite {
public static readonly ContentType ContentType = new ContentType { Name = "Site", DisplayName = "Site Settings" };
public string PageTitleSeparator {

2
src/Orchard.Web/Core/Settings/Models/SiteSettingsRecord.cs → src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs
View File

@@ -1,7 +1,7 @@
using Orchard.ContentManagement.Records;
namespace Orchard.Core.Settings.Models {
public class SiteSettingsRecord : ContentPartRecord {
public class SiteSettingsPartRecord : ContentPartRecord {
public virtual string SiteSalt { get; set; }
public virtual string SiteName { get; set; }
public virtual string SuperUser { get; set; }

4
src/Orchard.Web/Core/Settings/Services/SiteService.cs
View File

@@ -15,7 +15,7 @@ namespace Orchard.Core.Settings.Services {
private readonly ICacheManager _cacheManager;
public SiteService(
IRepository<SiteSettingsRecord> siteSettingsRepository,
IRepository<SiteSettingsPartRecord> siteSettingsRepository,
IContentManager contentManager,
ICacheManager cacheManager) {
_contentManager = contentManager;
@@ -32,7 +32,7 @@ namespace Orchard.Core.Settings.Services {
.FirstOrDefault();
if (site == null) {
site = _contentManager.Create<SiteSettings>("Site", item => {
site = _contentManager.Create<SiteSettingsPart>("Site", item => {
item.Record.SiteSalt = Guid.NewGuid().ToString("N");
item.Record.SiteName = "My Orchard Project Application";
item.Record.PageTitleSeparator = " - ";

18
src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs
View File

@@ -6,7 +6,7 @@ using Orchard.Core.Settings.Models;
namespace Orchard.Core.Settings.ViewModels {
public class SettingsIndexViewModel : BaseViewModel {
public SiteSettings Site { get; set; }
public SiteSettingsPart Site { get; set; }
public IEnumerable<string> SiteCultures { get; set; }
public ContentItemViewModel ViewModel { get; set; }
@@ -18,23 +18,23 @@ namespace Orchard.Core.Settings.ViewModels {
public string PageTitleSeparator
{
get { return Site.As<SiteSettings>().Record.PageTitleSeparator; }
set { Site.As<SiteSettings>().Record.PageTitleSeparator = value; }
get { return Site.As<SiteSettingsPart>().Record.PageTitleSeparator; }
set { Site.As<SiteSettingsPart>().Record.PageTitleSeparator = value; }
}
public string SiteName {
get { return Site.As<SiteSettings>().Record.SiteName; }
set { Site.As<SiteSettings>().Record.SiteName = value; }
get { return Site.As<SiteSettingsPart>().Record.SiteName; }
set { Site.As<SiteSettingsPart>().Record.SiteName = value; }
}
public string SiteCulture {
get { return Site.As<SiteSettings>().Record.SiteCulture; }
set { Site.As<SiteSettings>().Record.SiteCulture = value; }
get { return Site.As<SiteSettingsPart>().Record.SiteCulture; }
set { Site.As<SiteSettingsPart>().Record.SiteCulture = value; }
}
public string SuperUser {
get { return Site.As<SiteSettings>().Record.SuperUser; }
set { Site.As<SiteSettings>().Record.SuperUser = value; }
get { return Site.As<SiteSettingsPart>().Record.SuperUser; }
set { Site.As<SiteSettingsPart>().Record.SuperUser = value; }
}
}
}

2
src/Orchard.Web/Core/Settings/Views/EditorTemplates/Items/Settings.Site.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<SiteSettings>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ContentItemViewModel<SiteSettingsPart>>" %>
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<%@ Import Namespace="Orchard.Core.Settings.Models"%>
<% Html.Zone("primary");

2
src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
View File

@@ -167,7 +167,7 @@ namespace Orchard.Setup.Services {
// set site name and settings
var siteService = environment.Resolve<ISiteService>();
var siteSettings = siteService.GetSiteSettings().As<SiteSettings>();
var siteSettings = siteService.GetSiteSettings().As<SiteSettingsPart>();
siteSettings.Record.SiteSalt = Guid.NewGuid().ToString("N");
siteSettings.Record.SiteName = context.SiteName;
siteSettings.Record.SuperUser = context.AdminUsername;