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

Partial fix for widget position input

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-10-19 23:11:35 -07:00
parent 0ac10fd0f3
commit a11dfbf9e0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,12 +122,12 @@ namespace Orchard.Widgets.Services {
} }
public bool MoveWidgetUp(WidgetPart widgetPart) { public bool MoveWidgetUp(WidgetPart widgetPart) {
int currentPosition = int.Parse(widgetPart.Record.Position); int currentPosition = ParsePosition(widgetPart);
WidgetPart widgetBefore = GetWidgets(widgetPart.LayerPart.Id) WidgetPart widgetBefore = GetWidgets(widgetPart.LayerPart.Id)
.Where(widget => widget.Zone == widgetPart.Zone) .Where(widget => widget.Zone == widgetPart.Zone)
.OrderByDescending(widget => widget.Position, new UI.FlatPositionComparer()) .OrderByDescending(widget => widget.Position, new UI.FlatPositionComparer())
.FirstOrDefault(widget => int.Parse(widget.Record.Position) < currentPosition); .FirstOrDefault(widget => ParsePosition(widget) < currentPosition);
if (widgetBefore != null) { if (widgetBefore != null) {
SwitchWidgetPositions(widgetBefore, widgetPart); SwitchWidgetPositions(widgetBefore, widgetPart);
@@ -138,17 +138,24 @@ namespace Orchard.Widgets.Services {
return false; return false;
} }
private int ParsePosition(WidgetPart widgetPart) {
int value;
if (!int.TryParse(widgetPart.Record.Position, out value))
return 0;
return value;
}
public bool MoveWidgetUp(int widgetId) { public bool MoveWidgetUp(int widgetId) {
return MoveWidgetUp(GetWidget(widgetId)); return MoveWidgetUp(GetWidget(widgetId));
} }
public bool MoveWidgetDown(WidgetPart widgetPart) { public bool MoveWidgetDown(WidgetPart widgetPart) {
int currentPosition = int.Parse(widgetPart.Record.Position); int currentPosition = ParsePosition(widgetPart);
WidgetPart widgetAfter = GetWidgets(widgetPart.LayerPart.Id) WidgetPart widgetAfter = GetWidgets(widgetPart.LayerPart.Id)
.Where(widget => widget.Zone == widgetPart.Zone) .Where(widget => widget.Zone == widgetPart.Zone)
.OrderBy(widget => widget.Position, new UI.FlatPositionComparer()) .OrderBy(widget => widget.Position, new UI.FlatPositionComparer())
.FirstOrDefault(widget => int.Parse(widget.Record.Position) > currentPosition); .FirstOrDefault(widget => ParsePosition(widget) > currentPosition);
if (widgetAfter != null) { if (widgetAfter != null) {
SwitchWidgetPositions(widgetAfter, widgetPart); SwitchWidgetPositions(widgetAfter, widgetPart);