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

Fixes: U4-4373 @Library.NodeById(-1).Id returns "0" instead of "-1"(6.2.0 beta)

Browse Source
This commit is contained in:
Shannon
2014-03-17 11:45:42 +11:00
parent c66aca2d41
commit 4745995f92
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
View File

@@ -34,7 +34,7 @@ namespace Umbraco.Web.umbraco.presentation
if (doc == null)
{
Id = 0;
Id = -1;
return;
}

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

@@ -102,14 +102,17 @@ namespace umbraco.presentation.umbraco.dialogs
if (Access.GetProtectionType(documentId) == ProtectionType.Simple)
{
MembershipUser m = Access.GetAccessingMembershipUser(documentId);
pane_simple.Visible = true;
pp_pass.Visible = false;
simpleLogin.Visible = false;
SimpleLoginLabel.Visible = true;
SimpleLoginLabel.Text = m.UserName;
pane_advanced.Visible = false;
bt_protect.CommandName = "simple";
MembershipUser m = Access.GetAccessingMembershipUser(documentId);
if (m != null)
{
pane_simple.Visible = true;
pp_pass.Visible = false;
simpleLogin.Visible = false;
SimpleLoginLabel.Visible = true;
SimpleLoginLabel.Text = m.UserName;
pane_advanced.Visible = false;
bt_protect.CommandName = "simple";
}
}
else if (Access.GetProtectionType(documentId) == ProtectionType.Advanced)

6
src/umbraco.MacroEngines/RazorDynamicNode/RazorLibraryCore.cs
View File

@@ -33,13 +33,13 @@ namespace umbraco.MacroEngines.Library
public dynamic NodeById(int Id)
{
var node = new DynamicNode(Id);
if (node != null && node.Id == 0) return new DynamicNull();
if (node.Id == 0) return new DynamicNull();
return node;
}
public dynamic NodeById(string Id)
{
var node = new DynamicNode(Id);
if (node != null && node.Id == 0) return new DynamicNull();
if (node.Id == 0) return new DynamicNull();
return node;
}
public dynamic NodeById(DynamicNull Id)
@@ -53,7 +53,7 @@ namespace umbraco.MacroEngines.Library
return new DynamicNull();
}
var node = new DynamicNode(Id);
if (node != null && node.Id == 0) return new DynamicNull();
if (node.Id == 0) return new DynamicNull();
return node;
}
public dynamic NodesById(List<object> Ids)