From 094e6d370d92a3f5aa25dd8e084657f666f57c47 Mon Sep 17 00:00:00 2001
From: Jay Harris <jay@aranasoft.com>
Date: Tue, 24 Sep 2013 14:25:53 -0400
Subject: [PATCH] ContentPermissions editor was displaying Publish permissions
 under the Edit column header, and Edit permissions under the Publish column
 header. Fixed.

---
 .../Parts.ContentPermissions.cshtml           | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/EditorTemplates/Parts.ContentPermissions.cshtml b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/EditorTemplates/Parts.ContentPermissions.cshtml
index cc6da3109..7a476dfb7 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/EditorTemplates/Parts.ContentPermissions.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Views/EditorTemplates/Parts.ContentPermissions.cshtml
@@ -34,13 +34,6 @@
                         </label>
                         @Html.HiddenFor(m => m.ViewRoles[role.Index].Role)
                     </td>
-                    <td>
-                        <label>
-                            <input type="checkbox" disabled="disabled" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Current value"/>
-                            <input type="checkbox" value="true" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishRoles[role.Index].Checked)" @if (!Model.PublishRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
-                        </label>
-                        @Html.HiddenFor(m => m.PublishRoles[role.Index].Role)
-                    </td>
                     <td>
                         <label>
                             <input type="checkbox" disabled="disabled" @if (Model.EditRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Current value"/>
@@ -48,6 +41,13 @@
                         </label>
                         @Html.HiddenFor(m => m.EditRoles[role.Index].Role)
                     </td>
+                    <td>
+                        <label>
+                            <input type="checkbox" disabled="disabled" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Current value"/>
+                            <input type="checkbox" value="true" @if (Model.PublishRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishRoles[role.Index].Checked)" @if (!Model.PublishRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
+                        </label>
+                        @Html.HiddenFor(m => m.PublishRoles[role.Index].Role)
+                    </td>
                     <td>
                         <label>
                             <input type="checkbox" disabled="disabled" @if (Model.DeleteRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Current value"/>
@@ -78,13 +78,6 @@
                         </label>
                         @Html.HiddenFor(m => m.ViewOwnRoles[role.Index].Role)
                     </td>
-                    <td>
-                        <label>
-                            <input type="checkbox" disabled="disabled" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Current value"/>
-                            <input type="checkbox" value="true" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishOwnRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishOwnRoles[role.Index].Checked)" @if (!Model.PublishOwnRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
-                        </label>
-                        @Html.HiddenFor(m => m.PublishOwnRoles[role.Index].Role)
-                    </td>
                     <td>
                         <label>
                             <input type="checkbox" disabled="disabled" @if (Model.EditOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Current value"/>
@@ -92,6 +85,13 @@
                         </label>
                         @Html.HiddenFor(m => m.EditOwnRoles[role.Index].Role)
                     </td>
+                    <td>
+                        <label>
+                            <input type="checkbox" disabled="disabled" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Current value"/>
+                            <input type="checkbox" value="true" @if (Model.PublishOwnRoles.Any(x => x.Role == role.Name && x.Checked)) { <text>checked="checked"</text> } name="@Html.FieldNameFor(m => m.PublishOwnRoles[role.Index].Checked)" id="@Html.FieldIdFor(m => m.PublishOwnRoles[role.Index].Checked)" @if (!Model.PublishOwnRoles[role.Index].Enabled) { <text>disabled="disabled"</text> }/>
+                        </label>
+                        @Html.HiddenFor(m => m.PublishOwnRoles[role.Index].Role)
+                    </td>
                     <td>
                         <label>
                             <input type="checkbox" disabled="disabled" @if (Model.DeleteOwnRoles.Any(x => x.Role == role.Name && x.Default)) { <text>checked="checked"</text> } title="Current value"/>