From 3cfe526d9d913c723b74b1c5fa449f183b537aef Mon Sep 17 00:00:00 2001 From: starfighter83 Date: Thu, 4 Aug 2011 08:17:35 -0200 Subject: [PATCH] Fixes: Changing icon on membertype does not do anything Work Items: 29853 --- umbraco/cms/businesslogic/member/MemberType.cs | 1 + umbraco/presentation/umbraco/Trees/loadMembers.cs | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/umbraco/cms/businesslogic/member/MemberType.cs b/umbraco/cms/businesslogic/member/MemberType.cs index 523acd11ae..30b04b5b23 100644 --- a/umbraco/cms/businesslogic/member/MemberType.cs +++ b/umbraco/cms/businesslogic/member/MemberType.cs @@ -54,6 +54,7 @@ namespace umbraco.cms.businesslogic.member ContentType.Create(n.Id, Text,""); MemberType mt = new MemberType(n.Id); + mt.IconUrl = "member.gif"; NewEventArgs e = new NewEventArgs(); mt.OnNew(e); diff --git a/umbraco/presentation/umbraco/Trees/loadMembers.cs b/umbraco/presentation/umbraco/Trees/loadMembers.cs index 7a742457ec..efcbcbe102 100644 --- a/umbraco/presentation/umbraco/Trees/loadMembers.cs +++ b/umbraco/presentation/umbraco/Trees/loadMembers.cs @@ -144,8 +144,8 @@ function openContentItem(id) { treeElement.SetAttribute("text", m.Text); treeElement.SetAttribute("action", "javascript:openMember('" + m.Id + "');"); treeElement.SetAttribute("menu", "D"); - treeElement.SetAttribute("icon", "member.gif"); - treeElement.SetAttribute("openIcon", "member.gif"); + treeElement.SetAttribute("icon", string.IsNullOrEmpty(m.ContentType.IconUrl) ? "member.gif" : m.ContentType.IconUrl); + treeElement.SetAttribute("openIcon", string.IsNullOrEmpty(m.ContentType.IconUrl) ? "member.gif" : m.ContentType.IconUrl); treeElement.SetAttribute("nodeType", "member"); treeElement.SetAttribute("hasChildren", "true"); root.AppendChild(treeElement); @@ -163,8 +163,8 @@ function openContentItem(id) { treeElement.SetAttribute("text", m.Text); treeElement.SetAttribute("action", "javascript:openMember('" + m.Id + "');"); treeElement.SetAttribute("menu", "D"); - treeElement.SetAttribute("icon", "member.gif"); - treeElement.SetAttribute("openIcon", "member.gif"); + treeElement.SetAttribute("icon", string.IsNullOrEmpty(m.ContentType.IconUrl) ? "member.gif" : m.ContentType.IconUrl); + treeElement.SetAttribute("openIcon", string.IsNullOrEmpty(m.ContentType.IconUrl) ? "member.gif" : m.ContentType.IconUrl); treeElement.SetAttribute("nodeType", "member"); treeElement.SetAttribute("hasChildren", "true"); root.AppendChild(treeElement);