Moving default SiteSettings values to a handler.

--HG--
branch : dev

Ermesx:
Added missing time zone data and fixed conflicts
This commit is contained in:
Andre Rodrigues
2011-05-23 15:27:40 -07:00
committed by Wojciech Gadziński
parent 1729e73a73
commit 21b1fb9105
2 changed files with 13 additions and 13 deletions

View File

@@ -1,10 +1,20 @@
using Orchard.Core.Settings.Models; using System;
using Orchard.Core.Settings.Models;
using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.Handlers;
namespace Orchard.Core.Settings.Handlers { namespace Orchard.Core.Settings.Handlers {
public class SiteSettingsPartHandler : ContentHandler { public class SiteSettingsPartHandler : ContentHandler {
public SiteSettingsPartHandler() { public SiteSettingsPartHandler() {
Filters.Add(new ActivatingFilter<SiteSettingsPart>("Site")); Filters.Add(new ActivatingFilter<SiteSettingsPart>("Site"));
OnInitializing<SiteSettingsPart>(InitializeSiteSettings);
}
private static void InitializeSiteSettings(InitializingContentContext initializingContentContext, SiteSettingsPart siteSettingsPart) {
siteSettingsPart.SiteSalt = Guid.NewGuid().ToString("N");
siteSettingsPart.SiteName = "My Orchard Project Application";
siteSettingsPart.PageTitleSeparator = " - ";
siteSettingsPart.SiteTimeZone = TimeZoneInfo.Local.Id;
} }
} }
} }

View File

@@ -1,8 +1,6 @@
using System; using System.Linq;
using System.Linq;
using Orchard.Caching; using Orchard.Caching;
using Orchard.Core.Settings.Models; using Orchard.Core.Settings.Models;
using Orchard.Logging;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Settings; using Orchard.Settings;
@@ -16,11 +14,8 @@ namespace Orchard.Core.Settings.Services {
ICacheManager cacheManager) { ICacheManager cacheManager) {
_contentManager = contentManager; _contentManager = contentManager;
_cacheManager = cacheManager; _cacheManager = cacheManager;
Logger = NullLogger.Instance;
} }
public ILogger Logger { get; set; }
public ISite GetSiteSettings() { public ISite GetSiteSettings() {
var siteId = _cacheManager.Get("SiteId", ctx => { var siteId = _cacheManager.Get("SiteId", ctx => {
var site = _contentManager.Query("Site") var site = _contentManager.Query("Site")
@@ -28,12 +23,7 @@ namespace Orchard.Core.Settings.Services {
.FirstOrDefault(); .FirstOrDefault();
if (site == null) { if (site == null) {
site = _contentManager.Create<SiteSettingsPart>("Site", item => { site = _contentManager.Create<SiteSettingsPart>("Site").ContentItem;
item.SiteSalt = Guid.NewGuid().ToString("N");
item.SiteName = "My Orchard Project Application";
item.PageTitleSeparator = " - ";
item.SiteTimeZone = TimeZoneInfo.Local.Id;
}).ContentItem;
} }
return site.Id; return site.Id;