Merge

--HG-- branch : dev
2025-10-14 10:54:50 +08:00 · 2010-10-13 13:45:03 -07:00
parent f951118336 d81707ba6e
commit 75353a718f
5 changed files with 107 additions and 92 deletions
--- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
@@ -54,7 +54,7 @@ namespace Orchard.Search.Controllers {

            var searchViewModel = new SearchViewModel {
                Query = q,
-                DefaultPageSize = 10, // <- yeah, I know :|
+                DefaultPageSize = 10, // TODO: sebastien <- yeah, I know :|
                PageOfResults = pageOfItems
            };

--- a/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
@@ -24,7 +24,7 @@ namespace Orchard.Search {
                    .WithSetting("Stereotype", "Widget")
                );

-            return 5;
+            return 2;
        }
    }
 }
--- a/src/Orchard.Web/Modules/Orchard.Search/Models/SearchFormPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Models/SearchFormPart.cs
@@ -2,7 +2,7 @@

 namespace Orchard.Search.Models {
    /// <summary>
-    /// Cotnent part for the search form widget
+    /// Content part for the search form widget
    /// </summary>
    public class SearchFormPart : ContentPart {
    }
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
@@ -106,7 +106,7 @@ namespace Orchard.Widgets.Controllers {
            }
            catch (Exception exception) {
                Services.Notifier.Error(T("Creating widget failed: {0}", exception.Message));
-                return RedirectToAction("Index");
+                return RedirectToAction("Index", "Admin", new { id = layerId });
            }
        }

@@ -128,12 +128,12 @@ namespace Orchard.Widgets.Controllers {
                }

                Services.Notifier.Information(T("Your {0} has been created.", widgetPart.TypeDefinition.DisplayName));
-                return RedirectToAction("Index");
            }
            catch (Exception exception) {
                Services.Notifier.Error(T("Creating widget failed: {0}", exception.Message));
-                return RedirectToAction("Index");
            }
+
+            return RedirectToAction("Index", "Admin", new { id = layerId });
        }

        public ActionResult AddLayer() {
@@ -171,7 +171,7 @@ namespace Orchard.Widgets.Controllers {
                }

                Services.Notifier.Information(T("Your {0} has been created.", layerPart.TypeDefinition.DisplayName));
-                return RedirectToAction("Index");
+                return RedirectToAction("Index", "Admin", new { id = layerPart.Id });
            }
            catch (Exception exception) {
                Services.Notifier.Error(T("Creating layer failed: {0}", exception.Message));
@@ -194,7 +194,7 @@ namespace Orchard.Widgets.Controllers {
            }
            catch (Exception exception) {
                Services.Notifier.Error(T("Editing layer failed: {0}", exception.Message));
-                return RedirectToAction("Index");
+                return RedirectToAction("Index", "Admin", new { id });
            }
        }

@@ -216,12 +216,12 @@ namespace Orchard.Widgets.Controllers {
                }

                Services.Notifier.Information(T("Your {0} has been saved.", layerPart.TypeDefinition.DisplayName));
-                return RedirectToAction("Index");
            }
            catch (Exception exception) {
                Services.Notifier.Error(T("Editing layer failed: {0}", exception.Message));
-                return RedirectToAction("Index");
            }
+
+            return RedirectToAction("Index", "Admin", new { id });
        }

        [HttpPost, ActionName("EditLayer")]
@@ -238,15 +238,16 @@ namespace Orchard.Widgets.Controllers {
                Services.Notifier.Error(T("Removing Layer failed: {0}", exception.Message));
            }

-            return RedirectToAction("Index");
+            return RedirectToAction("Index", "Admin", new { id });
        }

        public ActionResult EditWidget(int id) {
            if (!Services.Authorizer.Authorize(Permissions.ManageWidgets, T(NotAuthorizedManageWidgetsLabel)))
                return new HttpUnauthorizedResult();

+            WidgetPart widgetPart = null;
            try {
-                WidgetPart widgetPart = _widgetsService.GetWidget(id);
+                widgetPart = _widgetsService.GetWidget(id);
                if (widgetPart == null) {
                    Services.Notifier.Error(T("Widget not found: {1}", id));
                    return RedirectToAction("Index");
@@ -257,6 +258,10 @@ namespace Orchard.Widgets.Controllers {
            }
            catch (Exception exception) {
                Services.Notifier.Error(T("Editing widget failed: {0}", exception.Message));
+
+                if (widgetPart != null)
+                    return RedirectToAction("Index", "Admin", new { id = widgetPart.LayerPart.Id });
+
                return RedirectToAction("Index");
            }
        }
@@ -267,11 +272,12 @@ namespace Orchard.Widgets.Controllers {
            if (!Services.Authorizer.Authorize(Permissions.ManageWidgets, T(NotAuthorizedManageWidgetsLabel)))
                return new HttpUnauthorizedResult();

+            WidgetPart widgetPart = null;
            try {
-                WidgetPart widgetPart = _widgetsService.GetWidget(id);
+                widgetPart = _widgetsService.GetWidget(id);
                if (widgetPart == null)
                    return new NotFoundResult();
-            
+
                var model = Services.ContentManager.UpdateEditor(widgetPart, this);
                if (!ModelState.IsValid) {
                    Services.TransactionManager.Cancel();
@@ -279,12 +285,14 @@ namespace Orchard.Widgets.Controllers {
                }

                Services.Notifier.Information(T("Your {0} has been saved.", widgetPart.TypeDefinition.DisplayName));
-                return RedirectToAction("Index");
            }
            catch (Exception exception) {
                Services.Notifier.Error(T("Editing widget failed: {0}", exception.Message));
-                return RedirectToAction("Index");
            }
+
+            return widgetPart != null ?
+                RedirectToAction("Index", "Admin", new { id = widgetPart.LayerPart.Id }) :
+                RedirectToAction("Index");
        }

        [HttpPost, ActionName("EditWidget")]
@@ -293,15 +301,22 @@ namespace Orchard.Widgets.Controllers {
            if (!Services.Authorizer.Authorize(Permissions.ManageWidgets, T(NotAuthorizedManageWidgetsLabel)))
                return new HttpUnauthorizedResult();

+            WidgetPart widgetPart = null;
            try {
-                _widgetsService.DeleteWidget(id);
+                widgetPart = _widgetsService.GetWidget(id);
+                if (widgetPart == null)
+                    return new NotFoundResult();
+
+                _widgetsService.DeleteWidget(widgetPart.Id);
                Services.Notifier.Information(T("Widget was successfully deleted"));
            } 
            catch (Exception exception) {
                Services.Notifier.Error(T("Removing Widget failed: {0}", exception.Message));
            }

-            return RedirectToAction("Index");
+            return widgetPart != null ?
+                RedirectToAction("Index", "Admin", new { id = widgetPart.LayerPart.Id }) : 
+                RedirectToAction("Index");
        }

        bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
@@ -11,83 +11,83 @@
    Html.ValidationSummary();


-	<div id="widgets">
-		
-		<div class="widgets-availableWidgets">
-			<h2>Available Widgets</h2>
+    <div id="widgets">

-			<fieldset>
-				<table class="items" summary="@T("This is a table of the widgets currently available for use in your application.")">
-					<colgroup>
-						<col id="Col1" />
-						<col id="Col2" />
-					</colgroup>
-					<thead>
-						<tr>
-							<th scope="col">@T("Name")</th>
-							<th scope="col"></th>
-						</tr>
-					</thead>
-					@foreach (string widget in Model.WidgetTypes) {
-						<tr>
-							<td>@widget</td>
-							<td>@Html.ActionLink(T("Add").ToString(), "AddWidget", new { layerId = Model.CurrentLayer.Id, widgetType = widget })</td>
-						</tr>
-					}
-				</table>
+        <div class="widgets-availableWidgets">
+            <h2>Available Widgets</h2>

-			</fieldset>
-		</div>
+            <fieldset>
+                <table class="items" summary="@T("This is a table of the widgets currently available for use in your application.")">
+                    <colgroup>
+                        <col id="Col1" />
+                        <col id="Col2" />
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th scope="col">@T("Name")</th>
+                            <th scope="col"></th>
+                        </tr>
+                    </thead>
+                    @foreach (string widget in Model.WidgetTypes) {
+                        <tr>
+                            <td>@widget</td>
+                            <td>@Html.ActionLink(T("Add").ToString(), "AddWidget", new { layerId = Model.CurrentLayer.Id, widgetType = widget })</td>
+                        </tr>
+                    }
+                </table>

-		<div class="widgets-availableLayers">
-				<h2>Widget Zones</h2>
+            </fieldset>
+        </div>

-			<fieldset>
-				<div>
-					<ul class="widgets-layerZones">
-						@foreach (string zone in Model.Zones) {
-							<li>
-								<div class="widgets-zone">@zone</div>
-								<ul>
-									@foreach (WidgetPart widget in Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).OrderBy(widgetPart => widgetPart.Position, new Orchard.UI.FlatPositionComparer())) {
-										<li class="widgets-zoneWidget">
-											@if (widget.Position != "1") {
-												<input type="image" name="submit.MoveUp.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/moveup.gif")" alt="Move up" value="@widget.Id" />
-											}
-											@if (int.Parse(widget.Position) < Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).Count()) {
-												<input type="image" name="submit.MoveDown.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/movedown.gif")" alt="Move down" value="@widget.Id" />
-											}
-											@Html.ActionLink(@widget.Title, "EditWidget", new { @widget.Id })
-										</li>
-									}
-								</ul>
-							</li>
-						}
-					</ul>
-				</div>
+        <div class="widgets-availableLayers">
+            <h2>Widget Zones</h2>

-				<div class="widgets-layers">
-					<ul>
-						@foreach (var layer in Model.Layers) {
-							if (layer.Id == Model.CurrentLayer.Id) {
-								<li class="widgets-currentLayer widgets-editLayer">
-									@Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
-									<a href="@Url.Action("EditLayer", new { @layer.Id })">
-										<img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
-									</a>
-								</li>
-							} else {
-								<li class="widgets-editLayer">
-									@Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
-									<a href="@Url.Action("EditLayer", new { @layer.Id })">
-										<img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
-									</a>
-								</li>
-							}
-						}
-					<ul>
-				</div>
-			</fieldset>
-		</div>
-	</div>
+            <fieldset>
+                <div>
+                    <ul class="widgets-layerZones">
+                        @foreach (string zone in Model.Zones) {
+                            <li>
+                                <div class="widgets-zone">@zone</div>
+                                <ul>
+                                    @foreach (WidgetPart widget in Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).OrderBy(widgetPart => widgetPart.Position, new Orchard.UI.FlatPositionComparer())) {
+                                        <li class="widgets-zoneWidget">
+                                            @if (widget.Position != "1") {
+                                                <input type="image" name="submit.MoveUp.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/moveup.gif")" alt="Move up" value="@widget.Id" />
+                                            }
+                                            @if (int.Parse(widget.Position) < Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).Count()) {
+                                                <input type="image" name="submit.MoveDown.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/movedown.gif")" alt="Move down" value="@widget.Id" />
+                                            }
+                                            @Html.ActionLink(@widget.Title, "EditWidget", new { @widget.Id })
+                                        </li>
+                                    }
+                                </ul>
+                            </li>
+                        }
+                    </ul>
+                </div>
+
+                <div class="widgets-layers">
+                    <ul>
+                        @foreach (var layer in Model.Layers) {
+                            if (layer.Id == Model.CurrentLayer.Id) {
+                                <li class="widgets-currentLayer widgets-editLayer">
+                                    @Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
+                                    <a href="@Url.Action("EditLayer", new { @layer.Id })">
+                                        <img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
+                                    </a>
+                                </li>
+                            } else {
+                                <li class="widgets-editLayer">
+                                    @Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
+                                    <a href="@Url.Action("EditLayer", new { @layer.Id })">
+                                        <img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
+                                    </a>
+                                </li>
+                            }
+                        }
+                    <ul>
+                </div>
+            </fieldset>
+        </div>
+    </div>
 }