lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-25 19:17:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard/Mvc/Routes/RoutePublisher.cs
This commit is contained in:
Sebastien Ros
2015-03-05 12:15:00 -08:00
parent b03c1bc901 1407ff7fce
commit 5ff2ad509b
51 changed files with 1465 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
View File

@@ -60,22 +60,26 @@ namespace Orchard.PublishLater.Drivers {
);
}
protected override DriverResult Editor(PublishLaterPart part, dynamic shapeHelper) {
var model = new PublishLaterViewModel(part) {
Editor = new DateTimeEditor() {
private PublishLaterViewModel BuildViewModelFromPart(PublishLaterPart part) {
return new PublishLaterViewModel(part) {
Editor = new DateTimeEditor() {
ShowDate = true,
ShowTime = true,
Date = !part.IsPublished() ? _dateLocalizationServices.ConvertToLocalizedDateString(part.ScheduledPublishUtc.Value) : "",
Time = !part.IsPublished() ? _dateLocalizationServices.ConvertToLocalizedTimeString(part.ScheduledPublishUtc.Value) : "",
}
};
};
}
protected override DriverResult Editor(PublishLaterPart part, dynamic shapeHelper) {
var model = BuildViewModelFromPart(part);
return ContentShape("Parts_PublishLater_Edit",
() => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
}
protected override DriverResult Editor(PublishLaterPart part, IUpdateModel updater, dynamic shapeHelper) {
var model = new PublishLaterViewModel(part);
var model = BuildViewModelFromPart(part);
updater.TryUpdateModel(model, Prefix, null, null);
var httpContext = _httpContextAccessor.Current();