Merge

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj

@@ -59,7 +59,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
-    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Commands\IndexingCommands.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Migrations.cs" />
@@ -100,6 +99,7 @@
     <Content Include="Views\DefinitionTemplates\FieldIndexing.cshtml" />
     <Content Include="Views\DefinitionTemplates\TypeIndexing.cshtml" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>

src/Orchard.Web/Modules/Orchard.Indexing/ResourceManifest.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Orchard.UI.Resources;
-
-namespace Orchard.Indexing {
-    public class ResourceManifest : IResourceManifestProvider {
-        public void BuildManifests(ResourceManifestBuilder builder) {
-            builder.Add().DefineStyle("IndexingAdmin").SetUrl("admin.css"); // todo: this does not exist
-        }
-    }
-}

src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.cshtml

@@ -1,5 +1,4 @@
 @model Orchard.Indexing.ViewModels.IndexViewModel
-@{ Style.Require("IndexingAdmin"); }
 
 <h1>@Html.TitleForPage(T("Search Index Management").ToString())</h1>
 @using (Html.BeginForm("update", "admin", FormMethod.Post, new {area = "Orchard.Indexing"})) { 

src/Orchard.Web/Modules/Orchard.Roles/Controllers/AdminController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
+using Orchard.Core.Contents.Controllers;
 using Orchard.Localization;
 using Orchard.Roles.Models;
 using Orchard.Roles.Services;
@@ -98,9 +99,9 @@ namespace Orchard.Roles.Controllers {
 
             var role = _roleService.GetRole(id);
             if (role == null) {
-                //TODO: Error message
+                return HttpNotFound();
-                throw new HttpException(404, "page with id " + id + " was not found");
             }
+
             var model = new RoleEditViewModel { Name = role.Name, Id = role.Id, 
                                                 RoleCategoryPermissions = _roleService.GetInstalledPermissions(),
                                                 CurrentPermissions = _roleService.GetPermissionsForRole(id)};
@@ -117,7 +118,8 @@ namespace Orchard.Roles.Controllers {
         }
 
         [HttpPost, ActionName("Edit")]
-        public ActionResult EditPOST() {
+        [FormValueRequired("submit.Save")]
+        public ActionResult EditSavePOST(int id) {
             if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles")))
                 return new HttpUnauthorizedResult();
 
@@ -125,24 +127,38 @@ namespace Orchard.Roles.Controllers {
             try {
                 UpdateModel(viewModel);
                 // Save
-                if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Save"])) {
+                List<string> rolePermissions = new List<string>();
-                    List<string> rolePermissions = new List<string>();
+                foreach (string key in Request.Form.Keys) {
-                    foreach (string key in Request.Form.Keys) {
+                    if (key.StartsWith("Checkbox.") && Request.Form[key] == "true") {
-                        if (key.StartsWith("Checkbox.") && Request.Form[key] == "true") {
+                        string permissionName = key.Substring("Checkbox.".Length);
-                            string permissionName = key.Substring("Checkbox.".Length);
+                        rolePermissions.Add(permissionName);
-                            rolePermissions.Add(permissionName);
-                        }
                     }
-                    _roleService.UpdateRole(viewModel.Id, viewModel.Name, rolePermissions);
                 }
-                else if (!String.IsNullOrEmpty(HttpContext.Request.Form["submit.Delete"])) {
+                _roleService.UpdateRole(viewModel.Id, viewModel.Name, rolePermissions);
-                    _roleService.DeleteRole(viewModel.Id);
+
-                }
+                Services.Notifier.Information(T("Your Role has been saved."));
-                return RedirectToAction("Edit", new { viewModel.Id });
+                return RedirectToAction("Edit", new { id });
             }
             catch (Exception exception) {
                 Services.Notifier.Error(T("Editing Role failed: {0}", exception.Message));
-                return RedirectToAction("Edit", viewModel.Id);
+                return RedirectToAction("Edit", id);
+            }
+        }
+
+        [HttpPost, ActionName("Edit")]
+        [FormValueRequired("submit.Delete")]
+        public ActionResult EditDeletePOST(int id) {
+            if (!Services.Authorizer.Authorize(Permissions.ManageRoles, T("Not authorized to manage roles")))
+                return new HttpUnauthorizedResult();
+
+            try {
+                _roleService.DeleteRole(id);
+
+                Services.Notifier.Information(T("Role was successfully deleted."));
+                return RedirectToAction("Index");
+            } catch (Exception exception) {
+                Services.Notifier.Error(T("Editing Role failed: {0}", exception.Message));
+                return RedirectToAction("Edit", id);
             }
         }
     }

src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj

@@ -103,6 +103,10 @@
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
       <Name>Orchard.Framework</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Core\Orchard.Core.csproj">
+      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
+      <Name>Orchard.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml

@@ -9,24 +9,24 @@
         <select id="Select1" name="roleActions">
             <option value="1">@T("Remove")</option>
         </select>
-		<input class="button" type="submit" value="@T("Apply")" />
+        <input class="button" type="submit" value="@T("Apply")" />
-	</fieldset>
+    </fieldset>
     <div class="manage">@Html.ActionLink(T("Add a role").ToString(), "Create", new { }, new { @class = "button primaryAction" })</div>
     <fieldset>
         <table class="items" summary="@T("This is a table of the roles currently available for use in your application.")">
             <colgroup>
                 <col id="Col1" />
-		        <col id="Col2" />
+                <col id="Col2" />
-			    <col id="Col3" />
+                <col id="Col3" />
-		    </colgroup>
+            </colgroup>
-		    <thead>
+            <thead>
-		        <tr>
+                <tr>
-			        <th scope="col">&nbsp;&darr;</th>
+                    <th scope="col">&nbsp;&darr;</th>
-				    <th scope="col">@T("Name")</th>
+                    <th scope="col">@T("Name")</th>
-				    <th scope="col"></th>
+                    <th scope="col"></th>
-			    </tr>
+                </tr>
-		    </thead>
+            </thead>
-		    @foreach (var row in Model.Rows) {
+            @foreach (var row in Model.Rows) {
                 <tr>
                     <td><input type="checkbox" value="true" name="@("Checkbox." + row.Id)"/></td>
                     <td>@row.Name</td>
@@ -34,7 +34,5 @@
                 </tr>
             }
         </table>
-
     </fieldset>
-
 }

src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs

@@ -44,9 +44,10 @@ namespace Orchard.Widgets.Controllers {
                                layers.First() :
                                layers.FirstOrDefault(layer => layer.Id == id);
 
-                if (currentLayer == null) {
+                if (currentLayer == null &&
+                    id != null) {
                     // Incorrect layer id passed
-                    Services.Notifier.Error(T("Layer not found: {1}", id));
+                    Services.Notifier.Error(T("Layer not found: {0}", id));
                     return RedirectToAction("Index");
                 }
 
@@ -254,7 +255,7 @@ namespace Orchard.Widgets.Controllers {
             try {
                 widgetPart = _widgetsService.GetWidget(id);
                 if (widgetPart == null) {
-                    Services.Notifier.Error(T("Widget not found: {1}", id));
+                    Services.Notifier.Error(T("Widget not found: {0}", id));
                     return RedirectToAction("Index");
                 }