Manually applying PR umbraco#347

nul800sebastiaan · nul800sebastiaan · commit 4a516f7da96c · 2014-04-07T13:01:43.000+02:00
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Globalization;
+using System.Linq;
 using System.Web.Security;
 using System.Web.UI;
 using System.Web.UI.WebControls;
@@ -32,10 +33,10 @@ public protectPage()
         protected ContentPicker errorPagePicker = new ContentPicker();
 
         override protected void OnInit(EventArgs e)
-        {           
+        {
             base.OnInit(e);
         }
-        
+
         protected void selectMode(object sender, EventArgs e)
         {
             p_mode.Visible = false;
@@ -111,7 +112,7 @@ protected void Page_Load(object sender, EventArgs e)
                             SimpleLoginLabel.Visible = true;
                             SimpleLoginLabel.Text = m.UserName;
                             pane_advanced.Visible = false;
-                            bt_protect.CommandName = "simple";    
+                            bt_protect.CommandName = "simple";
                         }
 
                     }
@@ -131,9 +132,9 @@ protected void Page_Load(object sender, EventArgs e)
             _memberGroups.ID = "Membergroups";
             _memberGroups.Width = 175;
             var selectedGroups = "";
-            var roles = Roles.GetAllRoles();
+            var roles = Roles.GetAllRoles().OrderBy(x => x);
 
-            if (roles.Length > 0)
+            if (roles.Any())
             {
                 foreach (string role in roles)
                 {
@@ -185,7 +186,7 @@ protected void protect_Click(object sender, CommandEventArgs e)
             if (Page.IsValid)
             {
                 int pageId = int.Parse(helper.Request("nodeId"));
-                
+
                 if (e.CommandName == "simple")
                 {
                     var memberLogin = simpleLogin.Visible ? simpleLogin.Text : SimpleLoginLabel.Text;
@@ -222,7 +223,7 @@ protected void protect_Click(object sender, CommandEventArgs e)
                     }
                     else if (pp_pass.Visible)
                     {
-                        SimpleLoginNameValidator.IsValid = false;                        
+                        SimpleLoginNameValidator.IsValid = false;
                         SimpleLoginLabel.Visible = true;
                         SimpleLoginLabel.Text = memberLogin;
                         simpleLogin.Visible = false;
@@ -567,6 +568,6 @@ protected void buttonRemoveProtection_Click(object sender, System.EventArgs e)
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder js;
 
-        
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Globalization;`
	`3`	`+using System.Linq;`
`3`	`4`	`using System.Web.Security;`
`4`	`5`	`using System.Web.UI;`
`5`	`6`	`using System.Web.UI.WebControls;`
`@@ -32,10 +33,10 @@ public protectPage()`
`32`	`33`	`protected ContentPicker errorPagePicker = new ContentPicker();`
`33`	`34`
`34`	`35`	`override protected void OnInit(EventArgs e)`
`35`		`- {`
	`36`	`+ {`
`36`	`37`	`base.OnInit(e);`
`37`	`38`	`}`
`38`		`-`
	`39`	`+`
`39`	`40`	`protected void selectMode(object sender, EventArgs e)`
`40`	`41`	`{`
`41`	`42`	`p_mode.Visible = false;`
`@@ -111,7 +112,7 @@ protected void Page_Load(object sender, EventArgs e)`
`111`	`112`	`SimpleLoginLabel.Visible = true;`
`112`	`113`	`SimpleLoginLabel.Text = m.UserName;`
`113`	`114`	`pane_advanced.Visible = false;`
`114`		`- bt_protect.CommandName = "simple";`
	`115`	`+ bt_protect.CommandName = "simple";`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`}`
`@@ -131,9 +132,9 @@ protected void Page_Load(object sender, EventArgs e)`
`131`	`132`	`_memberGroups.ID = "Membergroups";`
`132`	`133`	`_memberGroups.Width = 175;`
`133`	`134`	`var selectedGroups = "";`
`134`		`- var roles = Roles.GetAllRoles();`
	`135`	`+ var roles = Roles.GetAllRoles().OrderBy(x => x);`
`135`	`136`
`136`		`- if (roles.Length > 0)`
	`137`	`+ if (roles.Any())`
`137`	`138`	`{`
`138`	`139`	`foreach (string role in roles)`
`139`	`140`	`{`
`@@ -185,7 +186,7 @@ protected void protect_Click(object sender, CommandEventArgs e)`
`185`	`186`	`if (Page.IsValid)`
`186`	`187`	`{`
`187`	`188`	`int pageId = int.Parse(helper.Request("nodeId"));`
`188`		`-`
	`189`	`+`
`189`	`190`	`if (e.CommandName == "simple")`
`190`	`191`	`{`
`191`	`192`	`var memberLogin = simpleLogin.Visible ? simpleLogin.Text : SimpleLoginLabel.Text;`
`@@ -222,7 +223,7 @@ protected void protect_Click(object sender, CommandEventArgs e)`
`222`	`223`	`}`
`223`	`224`	`else if (pp_pass.Visible)`
`224`	`225`	`{`
`225`		`- SimpleLoginNameValidator.IsValid = false;`
	`226`	`+ SimpleLoginNameValidator.IsValid = false;`
`226`	`227`	`SimpleLoginLabel.Visible = true;`
`227`	`228`	`SimpleLoginLabel.Text = memberLogin;`
`228`	`229`	`simpleLogin.Visible = false;`
`@@ -567,6 +568,6 @@ protected void buttonRemoveProtection_Click(object sender, System.EventArgs e)`
`567`	`568`	`/// </remarks>`
`568`	`569`	`protected global::System.Web.UI.WebControls.PlaceHolder js;`
`569`	`570`
`570`		`-`
	`571`	`+`
`571`	`572`	`}`
`572`	`573`	`}`