yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0

Browse Source
This commit is contained in:
Morten Christensen
2013-08-26 17:01:05 +02:00
parent 2b82e74b90 ee4312b7f2
commit aed017641d
6 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -150,6 +150,8 @@
<key alias="updateDate">Last edited</key>
<key alias="uploadClear">Remove file</key>
<key alias="urls">Link to document</key>
<key alias="memberof">Member of group(s)</key>
<key alias="notmemberof">Not a member of group(s)</key>
</area>
<area alias="create">
<key alias="chooseNode">Where do you want to create the new %0%</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -134,6 +134,8 @@
<key alias="updateDate">Last edited</key>
<key alias="uploadClear">Remove file</key>
<key alias="urls">Link to document</key>
<key alias="memberof">Member of group(s)</key>
<key alias="notmemberof">Not a member of group(s)</key>
</area>
<area alias="create">
<key alias="chooseNode">Where do you want to create the new %0%</key>

8
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
View File

@@ -76,10 +76,16 @@ namespace umbraco.controls
LoadContentType();
SetupInfoPane();
if (!HideStructure)
if (HideStructure)
{
pnlStructure.Visible = false;
}
else
{
SetupStructurePane();
}
SetupGenericPropertiesPane();
SetupTabPane();

8
src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Web.Razor;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
@@ -57,6 +58,13 @@ namespace umbraco.controls
table.CellPadding = 5;
table.CellSpacing = 0;
table.Border = 0;
HtmlTableRow header = new HtmlTableRow();
header.Controls.Add(new HtmlTableCell { InnerHtml = ui.Text("content", "notmemberof") });
header.Controls.Add(new HtmlTableCell { InnerHtml= "&nbsp;" });
header.Controls.Add(new HtmlTableCell { InnerHtml = ui.Text("content", "memberof") });
table.Controls.Add(header);
HtmlTableRow row = new HtmlTableRow();
table.Controls.Add(row);
HtmlTableCell cFirst = new HtmlTableCell();

17
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
View File

@@ -2,6 +2,8 @@ using System;
using System.Web.Security;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Windows.Forms.VisualStyles;
using umbraco.cms.businesslogic.member;
using umbraco.cms.businesslogic.web;
using umbraco.controls;
using umbraco.cms.helpers;
@@ -193,7 +195,8 @@ namespace umbraco.presentation.umbraco.dialogs
{
try
{
if (cms.businesslogic.member.MemberType.GetByAlias("_umbracoSystemDefaultProtectType") == null)
if (
cms.businesslogic.member.MemberType.GetByAlias("_umbracoSystemDefaultProtectType") == null)
{
cms.businesslogic.member.MemberType.MakeNew(BusinessLogic.User.GetUser(0), "_umbracoSystemDefaultProtectType");
}
@@ -202,13 +205,23 @@ namespace umbraco.presentation.umbraco.dialogs
{
cms.businesslogic.member.MemberType.MakeNew(BusinessLogic.User.GetUser(0), "_umbracoSystemDefaultProtectType");
}
// create member
cms.businesslogic.member.Member mem = cms.businesslogic.member.Member.MakeNew(simpleLogin.Text, "", cms.businesslogic.member.MemberType.GetByAlias("_umbracoSystemDefaultProtectType"), base.getUser());
Member mem = cms.businesslogic.member.Member.MakeNew(simpleLogin.Text, "", cms.businesslogic.member.MemberType.GetByAlias("_umbracoSystemDefaultProtectType"), base.getUser());
// working around empty password restriction for Umbraco Member Mode
mem.Password = simplePassword.Text;
member = Membership.GetUser(simpleLogin.Text);
}
}
else
{
// change password if it's not empty
if (string.IsNullOrWhiteSpace(simplePassword.Text) == false)
{
var mem = Member.GetMemberFromLoginName(simpleLogin.Text);
mem.Password = simplePassword.Text;
}
}
// Create or find a memberGroup
string simpleRoleName = "__umbracoRole_" + simpleLogin.Text;

9
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
View File

@@ -68,20 +68,23 @@ namespace umbraco.presentation.webservices
public void Delete(string nodeId, string alias, string nodeType)
{
AuthorizeRequest(true);
//U4-2686 - alias is html encoded, make sure to decode
alias = HttpUtility.HtmlDecode(alias);
//check which parameters to pass depending on the types passed in
int intNodeID;
if (nodeType == "memberGroup")
{
presentation.create.dialogHandler_temp.Delete(nodeType, 0, alias);
create.dialogHandler_temp.Delete(nodeType, 0, alias);
}
else if (int.TryParse(nodeId, out intNodeID) && nodeType != "member") // Fix for #26965 - numeric member login gets parsed as nodeId
{
presentation.create.dialogHandler_temp.Delete(nodeType, intNodeID, alias);
create.dialogHandler_temp.Delete(nodeType, intNodeID, alias);
}
else
{
presentation.create.dialogHandler_temp.Delete(nodeType, 0, nodeId);
create.dialogHandler_temp.Delete(nodeType, 0, nodeId);
}
}