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

Move all usages of LazyField to Orchard.ContentManagement.Utilities.LazyField

Browse Source 
There is one change which have to verify:
Orchard.ContentManagement.Handlers.StorageFilter
Orchard.ContentManagement.Handlers.StorageVersionFilter
because I removed _value parameter from loader delegate - it was pointless and used nowhere except above filters.
This commit is contained in:
Wojciech Gadziński
2015-04-26 23:56:04 +02:00
parent 6afbc78395
commit b9973d91d8
24 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
using System;
using Orchard.Core.Common.Utilities;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
using Orchard.ContentManagement.Utilities;
using Orchard.Security;
namespace Orchard.Core.Common.Models {

2
src/Orchard.Web/Core/Containers/Models/ContainerPart.cs
View File

@@ -2,7 +2,7 @@
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData.Models;
using Orchard.ContentManagement.Records;
using Orchard.Core.Common.Utilities;
using Orchard.ContentManagement.Utilities;
using Orchard.Core.Containers.Services;
using Orchard.Core.Containers.Settings;
using Orchard.UI.Navigation;

4
src/Orchard.Web/Core/Navigation/Handlers/MenuPartHandler.cs
View File

@@ -35,7 +35,7 @@ namespace Orchard.Core.Navigation.Handlers {
return menu;
});
menuPart.MenuField.Loader(ctx =>
menuPart.MenuField.Loader(() =>
_contentManager.Get(menuPart.Record.MenuId, menuPart.IsPublished() ? VersionOptions.Published : VersionOptions.Latest)
);
}
@@ -46,7 +46,7 @@ namespace Orchard.Core.Navigation.Handlers {
if (part != null) {
string stereotype;
if (context.ContentItem.TypeDefinition.Settings.TryGetValue("Stereotype", out stereotype) && stereotype == "MenuItem") {
context.Metadata.DisplayText = part.MenuText;
context.Metadata.DisplayText = part.MenuText;
}
}
}

2
src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/ArchiveLaterPartHandler.cs
View File

@@ -14,7 +14,7 @@ namespace Orchard.ArchiveLater.Handlers {
}
protected void LazyLoadHandlers(ArchiveLaterPart part) {
part.ScheduledArchiveUtc.Loader((value) => _archiveLaterService.GetScheduledArchiveUtc(part));
part.ScheduledArchiveUtc.Loader(() => _archiveLaterService.GetScheduledArchiveUtc(part));
}
}
}

2
src/Orchard.Web/Modules/Orchard.AuditTrail/Models/AuditTrailSettingsPart.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
using Orchard.ContentManagement;
using Orchard.Core.Common.Utilities;
using Orchard.ContentManagement.Utilities;
namespace Orchard.AuditTrail.Models {
public class AuditTrailSettingsPart : ContentPart {

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Models/Assets/Asset.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using Orchard.Azure.MediaServices.Models.Records;
using Orchard.ContentManagement.FieldStorage;
using Orchard.Core.Common.Utilities;
using Orchard.ContentManagement.Utilities;
using Orchard.FileSystems.Media;
namespace Orchard.Azure.MediaServices.Models.Assets {

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Models/Jobs/Job.cs
View File

@@ -3,7 +3,7 @@ using System.Linq;
using System.Collections.Generic;
using Orchard.Azure.MediaServices.Helpers;
using Orchard.Azure.MediaServices.Models.Records;
using Orchard.Core.Common.Utilities;
using Orchard.ContentManagement.Utilities;
namespace Orchard.Azure.MediaServices.Models.Jobs {
public class Job {

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Models/Jobs/Task.cs
View File

@@ -1,6 +1,6 @@
using System.Xml.Linq;
using Orchard.Azure.MediaServices.Models.Records;
using Orchard.Core.Common.Utilities;
using Orchard.ContentManagement.Utilities;
namespace Orchard.Azure.MediaServices.Models.Jobs {
public class Task {

4
src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentPartHandler.cs
View File

@@ -16,11 +16,11 @@ namespace Orchard.Comments.Handlers {
OnLoading<CommentPart>((context, comment) => {
comment.CommentedOnContentItemField.Loader(
item => contentManager.Get(comment.CommentedOn)
() => contentManager.Get(comment.CommentedOn)
);
comment.CommentedOnContentItemMetadataField.Loader(
item => contentManager.GetItemMetadata(comment.CommentedOnContentItem)
() => contentManager.GetItemMetadata(comment.CommentedOnContentItem)
);
});

4
src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentsPartHandler.cs
View File

@@ -22,13 +22,13 @@ namespace Orchard.Comments.Handlers {
});
OnLoading<CommentsPart>((context, comments) => {
comments.CommentsField.Loader(list =>
comments.CommentsField.Loader(() =>
commentService.GetCommentsForCommentedContent(context.ContentItem.Id)
.Where(x => x.Status == CommentStatus.Approved)
.OrderBy(x => x.Position)
.List().ToList());
comments.PendingCommentsField.Loader(list =>
comments.PendingCommentsField.Loader(() =>
commentService.GetCommentsForCommentedContent(context.ContentItem.Id)
.Where(x => x.Status == CommentStatus.Pending)
.List().ToList());

2
src/Orchard.Web/Modules/Orchard.ContentPicker/Handlers/ContentMenuItemPartHandler.cs
View File

@@ -12,7 +12,7 @@ namespace Orchard.ContentPicker.Handlers {
Filters.Add(new ActivatingFilter<ContentMenuItemPart>("ContentMenuItem"));
Filters.Add(StorageFilter.For(repository));
OnLoading<ContentMenuItemPart>((context, part) => part._content.Loader(p => {
OnLoading<ContentMenuItemPart>((context, part) => part._content.Loader(() => {
if (part.ContentItemId != null) {
return contentManager.Get(part.ContentItemId.Value);
}

2
src/Orchard.Web/Modules/Orchard.ContentPicker/Handlers/ContentPickerFieldHandler.cs
View File

@@ -30,7 +30,7 @@ namespace Orchard.ContentPicker.Handlers {
foreach (var field in fields) {
var localField = field;
field._contentItems.Loader(x => _contentManager.GetMany<ContentItem>(localField.Ids, VersionOptions.Published, QueryHints.Empty));
field._contentItems.Loader(() => _contentManager.GetMany<ContentItem>(localField.Ids, VersionOptions.Published, QueryHints.Empty));
}
}
}

2
src/Orchard.Web/Modules/Orchard.Email/Handlers/SmtpSettingsPartHandler.cs
View File

@@ -47,7 +47,7 @@ namespace Orchard.Email.Handlers {
part.Store(x => x.Password, encryptedPassword);
});
part.AddressPlaceholderField.Loader(value => (string)((dynamic)ConfigurationManager.GetSection("system.net/mailSettings/smtp")).From);
part.AddressPlaceholderField.Loader(() => (string)((dynamic)ConfigurationManager.GetSection("system.net/mailSettings/smtp")).From);
}
public Localizer T { get; set; }

4
src/Orchard.Web/Modules/Orchard.Localization/Handlers/LocalizationPartHandler.cs
View File

@@ -42,10 +42,10 @@ namespace Orchard.Localization.Handlers {
}
protected void LazyLoadHandlers(LocalizationPart localizationPart) {
localizationPart.CultureField.Loader(ctx =>
localizationPart.CultureField.Loader(() =>
_cultureManager.GetCultureById(localizationPart.Record.CultureId));
localizationPart.MasterContentItemField.Loader(ctx =>
localizationPart.MasterContentItemField.Loader(() =>
_contentManager.Get(localizationPart.Record.MasterContentItemId, VersionOptions.AllVersions));
}
}

2
src/Orchard.Web/Modules/Orchard.MediaLibrary/Handlers/MediaPartHandler.cs
View File

@@ -17,7 +17,7 @@ namespace Orchard.MediaLibrary.Handlers {
OnRemoving<MediaPart>((context, part) => RemoveMedia(part));
OnLoaded<MediaPart>((context, part) => {
if (!String.IsNullOrEmpty(part.FileName)) {
part._publicUrl.Loader(x => _mediaLibraryService.GetMediaPublicUrl(part.FolderPath, part.FileName));
part._publicUrl.Loader(() => _mediaLibraryService.GetMediaPublicUrl(part.FolderPath, part.FileName));
}
});

2
src/Orchard.Web/Modules/Orchard.MediaPicker/Handlers/MediaGalleryFieldHandler.cs
View File

@@ -30,7 +30,7 @@ namespace Orchard.MediaPicker.Handlers {
foreach (var field in fields) {
var localField = field;
field._mediaGalleryItems.Loader(x => _jsonConverter.Deserialize<MediaGalleryItem[]>(localField.SelectedItems ?? "[]") ?? new MediaGalleryItem[0]);
field._mediaGalleryItems.Loader(() => _jsonConverter.Deserialize<MediaGalleryItem[]>(localField.SelectedItems ?? "[]") ?? new MediaGalleryItem[0]);
}
}
}

2
src/Orchard.Web/Modules/Orchard.PublishLater/Handlers/PublishLaterPartHandler.cs
View File

@@ -18,7 +18,7 @@ namespace Orchard.PublishLater.Handlers {
}
protected void LazyLoadHandlers(PublishLaterPart part) {
part.ScheduledPublishUtc.Loader((value) => _publishLaterService.GetScheduledPublishUtc(part));
part.ScheduledPublishUtc.Loader(() => _publishLaterService.GetScheduledPublishUtc(part));
}
}
}

2
src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesPartHandler.cs
View File

@@ -11,7 +11,7 @@ namespace Orchard.Roles.Handlers {
_userRolesRepository = userRolesRepository;
Filters.Add(new ActivatingFilter<UserRolesPart>("User"));
OnInitialized<UserRolesPart>((context, userRoles) => userRoles._roles.Loader(value => _userRolesRepository
OnInitialized<UserRolesPart>((context, userRoles) => userRoles._roles.Loader(() => _userRolesRepository
.Fetch(x => x.UserId == context.ContentItem.Id)
.Select(x => x.Role.Name).ToList()));
}

2
src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagCloudHandler.cs
View File

@@ -17,7 +17,7 @@ namespace Orchard.Tags.Handlers {
_signals = signals;
OnInitializing<TagCloudPart>((context, part) => part
._tagCountField.Loader(tags =>
._tagCountField.Loader(() =>
tagCloudService.GetPopularTags(part.Buckets, part.Slug).ToList()
));

2
src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TaxonomyPartHandler.cs
View File

@@ -42,7 +42,7 @@ namespace Orchard.Taxonomies.Handlers {
}
});
OnLoading<TaxonomyPart>( (context, part) => part.TermsField.Loader(x => taxonomyService.GetTerms(part.Id)));
OnLoading<TaxonomyPart>( (context, part) => part.TermsField.Loader(() => taxonomyService.GetTerms(part.Id)));
OnUpdating<TitlePart>((context, part) => {
// if altering the title of a taxonomy, save the name

4
src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs
View File

@@ -65,7 +65,7 @@ namespace Orchard.Taxonomies.Handlers {
foreach (var field in part.ContentItem.Parts.SelectMany(p => p.Fields).OfType<TaxonomyField>()) {
var tempField = field.Name;
field.TermsField.Loader(value => {
field.TermsField.Loader(() => {
var fieldTermRecordIds = part.Record.Terms.Where(t => t.Field == tempField).Select(tci => tci.TermRecord.Id);
var terms = _contentManager.GetMany<TermPart>(fieldTermRecordIds, VersionOptions.Published, queryHint);
return terms.ToList();
@@ -73,7 +73,7 @@ namespace Orchard.Taxonomies.Handlers {
}
part._termParts = new LazyField<IEnumerable<TermContentItemPart>>();
part._termParts.Loader(value => {
part._termParts.Loader(() => {
var ids = part.Terms.Select(t => t.TermRecord.Id).Distinct();
var terms = _contentManager.GetMany<TermPart>(ids, VersionOptions.Published, queryHint)
.ToDictionary(t => t.Id, t => t);

8
src/Orchard/ContentManagement/Handlers/StorageFilter.cs
View File

@@ -30,7 +30,11 @@ namespace Orchard.ContentManagement.Handlers {
return _repository.Get(versionRecord.ContentItemRecord.Id);
}
protected virtual TRecord CreateRecordCore(ContentItemVersionRecord versionRecord, TRecord record) {
protected virtual TRecord CreateRecordCore(ContentItemVersionRecord versionRecord, TRecord record = null)
{
if (record == null) {
record = new TRecord();
}
record.ContentItemRecord = versionRecord.ContentItemRecord;
_repository.Create(record);
return record;
@@ -51,7 +55,7 @@ namespace Orchard.ContentManagement.Handlers {
protected override void Loading(LoadContentContext context, ContentPart<TRecord> instance) {
var versionRecord = context.ContentItemVersionRecord;
instance._record.Loader(prior => GetRecordCore(versionRecord) ?? CreateRecordCore(versionRecord, prior));
instance._record.Loader(() => GetRecordCore(versionRecord) ?? CreateRecordCore(versionRecord));
}
protected override void Versioning(VersionContentContext context, ContentPart<TRecord> existing, ContentPart<TRecord> building) {

5
src/Orchard/ContentManagement/Handlers/StorageVersionFilter.cs
View File

@@ -12,7 +12,10 @@ namespace Orchard.ContentManagement.Handlers {
return _repository.Get(versionRecord.Id);
}
protected override TRecord CreateRecordCore(ContentItemVersionRecord versionRecord, TRecord record) {
protected override TRecord CreateRecordCore(ContentItemVersionRecord versionRecord, TRecord record = null) {
if (record == null) {
record = new TRecord();
}
record.ContentItemRecord = versionRecord.ContentItemRecord;
record.ContentItemVersionRecord = versionRecord;
_repository.Create(record);

6
src/Orchard/ContentManagement/Utilities/LazyField.cs
View File

@@ -3,7 +3,7 @@
namespace Orchard.ContentManagement.Utilities {
public class LazyField<T> {
private T _value;
private Func<T, T> _loader;
private Func<T> _loader;
private Func<T, T> _setter;
public T Value {
@@ -11,7 +11,7 @@ namespace Orchard.ContentManagement.Utilities {
set { SetValue(value); }
}
public void Loader(Func<T, T> loader) {
public void Loader(Func<T> loader) {
_loader = loader;
}
@@ -21,7 +21,7 @@ namespace Orchard.ContentManagement.Utilities {
private T GetValue() {
if (_loader != null) {
_value = _loader(_value);
_value = _loader();
_loader = null;
}
return _value;