From 74c167ed031bcf30eab0d52721ff5f0b0de04d8a Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Mon, 30 Jan 2017 13:18:30 +0100
Subject: [PATCH] U4-9413 moving links to document and media to top of generic
 properties.

---
 .../Models/Mapping/ContentModelMapper.cs      | 17 +++++----
 .../Models/Mapping/MediaModelMapper.cs        | 38 +++++++++----------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
index 27f34a12e6..18b03ba076 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
@@ -178,16 +178,10 @@ namespace Umbraco.Web.Models.Mapping
                     {
                         {"items", templateItemConfig}
                     }
-                },
-                new ContentPropertyDisplay
-                {
-                    Alias = string.Format("{0}urls", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
-                    Label = localizedText.Localize("content/urls"),
-                    Value = string.Join(",", display.Urls),
-                    View = "urllist" //TODO: Hard coding this because the templatepicker doesn't necessarily need to be a resolvable (real) property editor
                 }
             };
 
+
             TabsAndPropertiesResolver.MapGenericProperties(content, display, localizedText, properties.ToArray(),
                 genericProperties =>
                 {
@@ -219,6 +213,15 @@ namespace Umbraco.Web.Models.Mapping
                         //TODO: Hard coding this because the templatepicker doesn't necessarily need to be a resolvable (real) property editor
                         docTypeProperty.View = "urllist";
                     }
+
+                    // inject 'Link to document' as the first generic property
+                    genericProperties.Insert(0, new ContentPropertyDisplay
+                    {
+                        Alias = string.Format("{0}urls", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
+                        Label = localizedText.Localize("content/urls"),
+                        Value = string.Join(",", display.Urls),
+                        View = "urllist" //TODO: Hard coding this because the templatepicker doesn't necessarily need to be a resolvable (real) property editor
+                    });
                 });
         }
 
diff --git a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
index 4bcdf7a158..b8aaef3e33 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
@@ -66,8 +66,8 @@ namespace Umbraco.Web.Models.Mapping
 
         private static void AfterMap(IMedia media, MediaItemDisplay display, IDataTypeService dataTypeService, ILocalizedTextService localizedText, ILogger logger)
         {
-			// Adapted from ContentModelMapper
-			//map the IsChildOfListView (this is actually if it is a descendant of a list view!)
+            // Adapted from ContentModelMapper
+            //map the IsChildOfListView (this is actually if it is a descendant of a list view!)
             //TODO: Fix this shorthand .Ancestors() lookup, at least have an overload to use the current
             if (media.HasIdentity)
             {
@@ -92,7 +92,7 @@ namespace Umbraco.Web.Models.Mapping
                     display.IsChildOfListView = ancesctorListView != null;
                 }
             }
-			
+
             //map the tree node url
             if (HttpContext.Current != null)
             {
@@ -100,12 +100,12 @@ namespace Umbraco.Web.Models.Mapping
                 var url = urlHelper.GetUmbracoApiService<MediaTreeController>(controller => controller.GetTreeNode(display.Id.ToString(), null));
                 display.TreeNodeUrl = url;
             }
-            
+
             if (media.ContentType.IsContainer)
             {
                 TabsAndPropertiesResolver.AddListView(display, "media", dataTypeService, localizedText);
             }
-            
+
             var genericProperties = new List<ContentPropertyDisplay>
             {
                 new ContentPropertyDisplay
@@ -117,20 +117,6 @@ namespace Umbraco.Web.Models.Mapping
                 }
             };
 
-            var links = media.GetUrls(UmbracoConfig.For.UmbracoSettings().Content, logger);
-
-            if (links.Any())
-            {
-                var link = new ContentPropertyDisplay
-                {
-                    Alias = string.Format("{0}urls", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
-                    Label = localizedText.Localize("media/urls"),
-                    Value = string.Join(",", links),
-                    View = "urllist"
-                };
-                genericProperties.Add(link);
-            }
-
             TabsAndPropertiesResolver.MapGenericProperties(media, display, localizedText, genericProperties, properties =>
             {
                 if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
@@ -152,6 +138,20 @@ namespace Umbraco.Web.Models.Mapping
                     };
                     docTypeProperty.View = "urllist";
                 }
+
+                // inject 'Link to media' as the first generic property
+                var links = media.GetUrls(UmbracoConfig.For.UmbracoSettings().Content, logger);
+                if (links.Any())
+                {
+                    var link = new ContentPropertyDisplay
+                    {
+                        Alias = string.Format("{0}urls", Constants.PropertyEditors.InternalGenericPropertiesPrefix),
+                        Label = localizedText.Localize("media/urls"),
+                        Value = string.Join(",", links),
+                        View = "urllist"
+                    };
+                    properties.Insert(0, link);
+                }
             });
         }
     }