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

Fixed versioning issues.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-05-21 00:12:46 +02:00
parent cb7a52b25c
commit 064ee72d6d
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Orchard.Web/Modules/Orchard.Dashboards/Services/DefaultDashboardSelector.cs
View File

@@ -15,15 +15,26 @@ namespace Orchard.Dashboards.Services {
public DashboardDescriptor GetDashboardDescriptor() { public DashboardDescriptor GetDashboardDescriptor() {
var settings = _services.WorkContext.CurrentSite.As<DashboardSiteSettingsPart>(); var settings = _services.WorkContext.CurrentSite.As<DashboardSiteSettingsPart>();
var dashboardId = settings.DefaultDashboardId; var dashboardId = settings.DefaultDashboardId;
var dashboard = dashboardId != null ? _services.ContentManager.Get(dashboardId.Value) : default(ContentItem); var dashboard = dashboardId != null ? _services.ContentManager.Get(dashboardId.Value, VersionOptions.Latest) : default(ContentItem);
var descriptor = new DashboardDescriptor { Priority = -10 }; var descriptor = new DashboardDescriptor { Priority = -10 };
if (dashboard == null) if (dashboard == null)
dashboard = CreateDefaultDashboard(); dashboard = CreateDefaultDashboard();
descriptor.Display = shapeFactory => _services.ContentManager.BuildDisplay(dashboard, displayType: "Dashboard"); descriptor.Display = shapeFactory => {
descriptor.Editor = shapeFactory => _services.ContentManager.BuildEditor(dashboard); var published = _services.ContentManager.Get(dashboard.Id, VersionOptions.Published);
descriptor.UpdateEditor = (shapeFactory, updater) => _services.ContentManager.UpdateEditor(dashboard, updater); return _services.ContentManager.BuildDisplay(published, displayType: "Dashboard");
};
descriptor.Editor = shapeFactory => {
var latest = _services.ContentManager.Get(dashboard.Id, VersionOptions.Latest);
return _services.ContentManager.BuildEditor(latest);
};
descriptor.UpdateEditor = (shapeFactory, updater) => {
var draft = _services.ContentManager.Get(dashboard.Id, VersionOptions.DraftRequired);
return _services.ContentManager.UpdateEditor(draft, updater);
};
return descriptor; return descriptor;
} }