lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-07-16 09:20:44 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues 2010-10-14 16:25:14 -07:00
commit af3a348770
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
View File

@ -44,6 +44,12 @@ namespace Orchard.Widgets.Controllers {
layers.First() : layers.First() :
layers.FirstOrDefault(layer => layer.Id == id); layers.FirstOrDefault(layer => layer.Id == id);
if (currentLayer == null) {
// Incorrect layer id passed
Services.Notifier.Error(T("Layer not found: {1}", id));
return RedirectToAction("Index");
}
currentLayerWidgets = _widgetsService.GetWidgets().Where(widgetPart => widgetPart.LayerPart.Id == currentLayer.Id); currentLayerWidgets = _widgetsService.GetWidgets().Where(widgetPart => widgetPart.LayerPart.Id == currentLayer.Id);
} }
else { else {
@ -237,7 +243,7 @@ namespace Orchard.Widgets.Controllers {
Services.Notifier.Error(T("Removing Layer failed: {0}", exception.Message)); Services.Notifier.Error(T("Removing Layer failed: {0}", exception.Message));
} }
return RedirectToAction("Index", "Admin", new { id }); return RedirectToAction("Index");
} }
public ActionResult EditWidget(int id) { public ActionResult EditWidget(int id) {

13
src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
View File

@ -3,6 +3,7 @@ using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects; using Orchard.ContentManagement.Aspects;
using Orchard.Core.Common.Models;
using Orchard.Themes; using Orchard.Themes;
using Orchard.Widgets.Models; using Orchard.Widgets.Models;
@ -78,11 +79,21 @@ namespace Orchard.Widgets.Services {
} }
public void DeleteLayer(int layerId) { public void DeleteLayer(int layerId) {
// Delete widgets in the layer
foreach (WidgetPart widgetPart in GetWidgets(layerId)) {
DeleteWidget(widgetPart.Id);
}
// Delete actual layer
_contentManager.Remove(GetLayer(layerId).ContentItem); _contentManager.Remove(GetLayer(layerId).ContentItem);
} }
public WidgetPart GetWidget(int widgetId) { public WidgetPart GetWidget(int widgetId) {
return GetWidgets().FirstOrDefault(widgetPart => widgetPart.Id == widgetId); return _contentManager
.Query<WidgetPart, WidgetPartRecord>()
.Where(widget => widget.Id == widgetId)
.List()
.FirstOrDefault();
} }
public WidgetPart CreateWidget(int layerId, string widgetType, string title, string position, string zone) { public WidgetPart CreateWidget(int layerId, string widgetType, string title, string position, string zone) {