lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-23 04:43:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Refactoring Model concepts into ContentItem based concepts.

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041350
This commit is contained in:
loudej
2009-11-19 05:17:02 +00:00
parent ca6566ef73
commit 3d867826c5
64 changed files with 406 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Core/Common/Models/CommonDriver.cs
View File

@@ -9,17 +9,17 @@ namespace Orchard.Core.Common.Models {
public class CommonDriver : ModelDriver {
private readonly IClock _clock;
private readonly IAuthenticationService _authenticationService;
private readonly IModelManager _modelManager;
private readonly IContentManager _contentManager;
public CommonDriver(
IRepository<CommonRecord> repository,
IClock clock,
IAuthenticationService authenticationService,
IModelManager modelManager) {
IContentManager contentManager) {
_clock = clock;
_authenticationService = authenticationService;
_modelManager = modelManager;
_contentManager = contentManager;
AddOnCreating<CommonModel>(SetCreateTimesAndAuthor);
Filters.Add(new StorageFilterForRecord<CommonRecord>(repository));
@@ -42,7 +42,7 @@ namespace Orchard.Core.Common.Models {
void LoadOwnerModel(LoadModelContext context, CommonModel instance) {
if (instance.Record.OwnerId != 0) {
instance.Owner = _modelManager.Get(instance.Record.OwnerId).As<IUser>();
instance.Owner = _contentManager.Get(instance.Record.OwnerId).As<IUser>();
}
}
}

2
src/Orchard.Web/Core/Common/Models/CommonModel.cs
View File

@@ -3,7 +3,7 @@ using Orchard.Models;
using Orchard.Security;
namespace Orchard.Core.Common.Models {
public class CommonModel : ModelPartWithRecord<CommonRecord> {
public class CommonModel : ContentItemPartWithRecord<CommonRecord> {
public IUser Owner { get; set; }
}
}

2
src/Orchard.Web/Core/Common/Models/ContentModel.cs
View File

@@ -1,7 +1,7 @@
using Orchard.Models;
namespace Orchard.Core.Common.Models {
public class ContentModel : ModelPart {
public class ContentModel : ContentItemPart {
public string Body { get; set; }
public string Format { get; set; }
}

2
src/Orchard.Web/Core/Common/Models/RoutableModel.cs
View File

@@ -2,6 +2,6 @@ using Orchard.Core.Common.Records;
using Orchard.Models;
namespace Orchard.Core.Common.Models {
public class RoutableModel : ModelPartWithRecord<RoutableRecord> {
public class RoutableModel : ContentItemPartWithRecord<RoutableRecord> {
}
}

2
src/Orchard.Web/Core/Common/Records/CommonRecord.cs
View File

@@ -2,7 +2,7 @@
using Orchard.Models.Records;
namespace Orchard.Core.Common.Records {
public class CommonRecord : ModelPartRecord {
public class CommonRecord : ContentPartRecordBase {
public virtual int OwnerId { get; set; }
public virtual DateTime? CreatedUtc { get; set; }
public virtual DateTime? ModifiedUtc { get; set; }

2
src/Orchard.Web/Core/Common/Records/RoutableRecord.cs
View File

@@ -1,7 +1,7 @@
using Orchard.Models.Records;
namespace Orchard.Core.Common.Records {
public class RoutableRecord : ModelPartRecord {
public class RoutableRecord : ContentPartRecordBase {
public virtual string Title { get; set; }
public virtual string Slug { get; set; }
}

2
src/Orchard.Web/Core/Settings/Models/SiteModel.cs
View File

@@ -3,7 +3,7 @@ using Orchard.Models;
using Orchard.Settings;
namespace Orchard.Core.Settings.Models {
public sealed class SiteModel : ModelPartWithRecord<SiteSettingsRecord>, ISite {
public sealed class SiteModel : ContentItemPartWithRecord<SiteSettingsRecord>, ISite {
public string SiteName {
get { return Record.SiteName; }
set { Record.SiteName = value; }

2
src/Orchard.Web/Core/Settings/Records/SiteSettingsRecord.cs
View File

@@ -1,7 +1,7 @@
using Orchard.Models.Records;
namespace Orchard.Core.Settings.Records {
public class SiteSettingsRecord : ModelPartRecord {
public class SiteSettingsRecord : ContentPartRecordBase {
public virtual string SiteUrl { get; set; }
public virtual string SiteName { get; set; }
public virtual string SuperUser { get; set; }

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

@@ -9,11 +9,11 @@ using System.Web;
namespace Orchard.Core.Settings.Services {
public class SiteService : ISiteService {
private readonly IRepository<SiteSettingsRecord> _siteSettingsRepository;
private readonly IModelManager _modelManager;
private readonly IContentManager _contentManager;
public SiteService(IRepository<SiteSettingsRecord> siteSettingsRepository, IModelManager modelManager) {
public SiteService(IRepository<SiteSettingsRecord> siteSettingsRepository, IContentManager contentManager) {
_siteSettingsRepository = siteSettingsRepository;
_modelManager = modelManager;
_contentManager = contentManager;
Logger = NullLogger.Instance;
}
@@ -25,12 +25,12 @@ namespace Orchard.Core.Settings.Services {
string applicationName = HttpContext.Current.Request.ApplicationPath;
SiteSettingsRecord record = _siteSettingsRepository.Get(x => x.SiteUrl == applicationName);
if (record == null) {
SiteModel site = _modelManager.New("site").As<SiteModel>();
SiteModel site = _contentManager.New("site").As<SiteModel>();
site.Record.SiteUrl = applicationName;
_modelManager.Create(site);
_contentManager.Create(site);
return site;
}
return _modelManager.Get(record.Id).As<ISite>();
return _contentManager.Get(record.Id).As<ISite>();
}
#endregion