From ea67e217960a34f485a1aa9010d3c69544e0204e Mon Sep 17 00:00:00 2001 From: Thomas Nielsen Date: Wed, 2 Nov 2016 21:20:03 +0100 Subject: [PATCH 1/3] Link to mediatype from media properties --- .../Models/Mapping/MediaModelMapper.cs | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs index d13da67e1f..5f2a8bfd1d 100644 --- a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs @@ -155,7 +155,27 @@ namespace Umbraco.Web.Models.Mapping genericProperties.Add(link); } - TabsAndPropertiesResolver.MapGenericProperties(media, display, localizedText, genericProperties); + TabsAndPropertiesResolver.MapGenericProperties(media, display, localizedText, genericProperties, properties => { + if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null + && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings))) + { + var docTypeLink = string.Format("#/settings/mediatypes/edit/{0}", media.ContentTypeId); + + //Replace the doc type property + var docTypeProp = properties.First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + docTypeProp.Value = new List + { + new + { + linkText = media.ContentType.Name, + url = docTypeLink, + target = "_self", icon = "icon-item-arrangement" + } + }; + docTypeProp.View = "urllist"; + } + + }); } } From 16ae5cf6345122395d944e91fd3937027198fcc0 Mon Sep 17 00:00:00 2001 From: Thomas Nielsen Date: Tue, 8 Nov 2016 23:00:14 +0100 Subject: [PATCH 2/3] Link to member type from member properties --- .../Models/Mapping/MemberModelMapper.cs | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs index 050fe3c726..6d4bdd7941 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs @@ -233,7 +233,26 @@ namespace Umbraco.Web.Models.Mapping }; - TabsAndPropertiesResolver.MapGenericProperties(member, display, localizedText, genericProperties); + TabsAndPropertiesResolver.MapGenericProperties(member, display, localizedText, genericProperties, properties => { + if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null + && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings))) + { + var docTypeLink = string.Format("#/member/memberTypes/edit/{0}", member.ContentTypeId); + + //Replace the doc type property + var docTypeProp = properties.First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); + docTypeProp.Value = new List + { + new + { + linkText = member.ContentType.Name, + url = docTypeLink, + target = "_self", icon = "icon-item-arrangement" + } + }; + docTypeProp.View = "urllist"; + } + }); //check if there's an approval field var provider = membersProvider as global::umbraco.providers.members.UmbracoMembershipProvider; From 981c0b83d3ea2784173f4273a57dee2457f75cfb Mon Sep 17 00:00:00 2001 From: Thomas Nielsen Date: Tue, 8 Nov 2016 23:16:10 +0100 Subject: [PATCH 3/3] Oops wrong pull request --- .../Models/Mapping/MemberModelMapper.cs | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs index 6d4bdd7941..050fe3c726 100644 --- a/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs @@ -233,26 +233,7 @@ namespace Umbraco.Web.Models.Mapping }; - TabsAndPropertiesResolver.MapGenericProperties(member, display, localizedText, genericProperties, properties => { - if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null - && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings))) - { - var docTypeLink = string.Format("#/member/memberTypes/edit/{0}", member.ContentTypeId); - - //Replace the doc type property - var docTypeProp = properties.First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix)); - docTypeProp.Value = new List - { - new - { - linkText = member.ContentType.Name, - url = docTypeLink, - target = "_self", icon = "icon-item-arrangement" - } - }; - docTypeProp.View = "urllist"; - } - }); + TabsAndPropertiesResolver.MapGenericProperties(member, display, localizedText, genericProperties); //check if there's an approval field var provider = membersProvider as global::umbraco.providers.members.UmbracoMembershipProvider;