Nicer variable name, thank to Lee Kelleher!

Optimizing use of newlines array
adding to tinyMceConfig.Release.config.
2018-01-19 12:50:45 +01:00 · 2018-01-19 12:42:04 +01:00 · 2018-01-19 12:21:57 +01:00 · 2018-01-19 11:11:53 +01:00 · 2018-01-19 11:11:13 +01:00 · 2018-01-19 08:26:34 +01:00
34 changed files with 145 additions and 93 deletions
@@ -29,7 +29,7 @@
      <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
      <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
      <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.4, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.5, 2.0.0)" />
      <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
      <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
      <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
@@ -11,5 +11,5 @@ using System.Resources;

 [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyFileVersion("7.7.8")]
-[assembly: AssemblyInformationalVersion("7.7.8")]
+[assembly: AssemblyFileVersion("7.7.9")]
+[assembly: AssemblyInformationalVersion("7.7.9")]
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("7.7.8");
+        private static readonly Version Version = new Version("7.7.9");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -21,9 +21,9 @@ namespace Umbraco.Core
        public static DateTime TruncateTo(this DateTime dt, DateTruncate truncateTo)
        {
            if (truncateTo == DateTruncate.Year)
-                return new DateTime(dt.Year, 0, 0);
+                return new DateTime(dt.Year, 1, 1);
            if (truncateTo == DateTruncate.Month)
-                return new DateTime(dt.Year, dt.Month, 0);
+                return new DateTime(dt.Year, dt.Month, 1);
            if (truncateTo == DateTruncate.Day)
                return new DateTime(dt.Year, dt.Month, dt.Day);
            if (truncateTo == DateTruncate.Hour)
@@ -41,43 +41,43 @@ namespace Umbraco.Core
            Hour,
            Minute,
            Second
-        }
-
+        }
+
        /// <summary>
-        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
+        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
        /// date time is before the time, calculate onto next day)
        /// </summary>
        /// <param name="fromDateTime">Date to start from</param>
        /// <param name="scheduledTime">Time to compare against (in Hmm form, e.g. 330, 2200)</param>
-        /// <returns></returns>
-        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
-        {
-            // Ensure time provided is 4 digits long
-            if (scheduledTime.Length == 3)
-            {
-                scheduledTime = "0" + scheduledTime;
-            }
-
-            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
-            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
-
-            DateTime scheduledDateTime;
-            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
-            {
-                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
-            }
-            else
-            {
-                var nextDay = fromDateTime.AddDays(1);
-                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
-            }
-
-            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
-        }
-
-        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
-        {
-            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
+        /// <returns></returns>
+        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
+        {
+            // Ensure time provided is 4 digits long
+            if (scheduledTime.Length == 3)
+            {
+                scheduledTime = "0" + scheduledTime;
+            }
+
+            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
+            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
+
+            DateTime scheduledDateTime;
+            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
+            {
+                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
+            }
+            else
+            {
+                var nextDay = fromDateTime.AddDays(1);
+                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
+            }
+
+            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
+        }
+
+        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
+        {
+            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
        }
    }
 }
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Packaging.Models;

 namespace Umbraco.Core.Events
@@ -7,18 +8,27 @@ namespace Umbraco.Core.Events
    public class ImportPackageEventArgs<TEntity> : CancellableEnumerableObjectEventArgs<TEntity>, IEquatable<ImportPackageEventArgs<TEntity>>
    {
        private readonly MetaData _packageMetaData;
-
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the overload specifying packageMetaData instead")]
        public ImportPackageEventArgs(TEntity eventObject, bool canCancel)
            : base(new[] { eventObject }, canCancel)
        {
        }

-        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
-            : base(new[] { eventObject })
+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData, bool canCancel)
+            : base(new[] { eventObject }, canCancel)
        {
+            if (packageMetaData == null) throw new ArgumentNullException("packageMetaData");
            _packageMetaData = packageMetaData;
        }

+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
+            : this(eventObject, packageMetaData, true)
+        {
+            
+        }
+
        public MetaData PackageMetaData
        {
            get { return _packageMetaData; }
@@ -95,8 +95,10 @@ namespace Umbraco.Core.Models
            get { return _allowedTemplates; }
            set
            {
-                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector,
-                   Ps.Value.TemplateComparer);
+                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector, Ps.Value.TemplateComparer);
+
+                if (_allowedTemplates.Any(x => x.Id == _defaultTemplate) == false)
+                    DefaultTemplateId = 0;
            }
        }

@@ -20,6 +20,12 @@ namespace Umbraco.Core.Persistence.Repositories

                var name = Name;

+				// cater for instances where node has no name.
+				if(string.IsNullOrWhiteSpace(name))
+				{
+					return _numPos;
+ 				}
+
                if (name[name.Length - 1] != ')')
                    return _numPos = -1;

@@ -106,7 +112,7 @@ namespace Umbraco.Core.Persistence.Repositories
                }
            }

-            return uniqueing ? string.Concat(nodeName, " (", uniqueNumber.ToString(), ")") : nodeName;
+            return uniqueing || string.IsNullOrWhiteSpace(nodeName) ? string.Concat(nodeName, " (", uniqueNumber.ToString(), ")") : nodeName;
        }
    }
 }
@@ -18,6 +18,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
            return Constants.PropertyEditors.MultipleTextstringAlias.Equals(propertyType.PropertyEditorAlias);
        }

+        private static readonly string[] NewLineDelimiters = { "\r\n", "\r", "\n" };
+
        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
        {
            // data is (both in database and xml):
@@ -53,7 +55,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
            // Fall back on normal behaviour
            if (values.Any() == false)
            {
-                return sourceString.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
+                return sourceString.Split(NewLineDelimiters, StringSplitOptions.None);
            }

            return values.ToArray();
@@ -695,7 +695,7 @@ namespace Umbraco.Core.Services
                IQuery<IMember> filterQuery = null;
                if (filter.IsNullOrWhiteSpace() == false)
                {
-                    filterQuery = Query<IMember>.Builder.Where(x => x.Name.Contains(filter) || x.Username.Contains(filter));
+                    filterQuery = Query<IMember>.Builder.Where(x => x.Name.Contains(filter) || x.Username.Contains(filter) || x.Email.Contains(filter));
                }

                var repository = RepositoryFactory.CreateMemberRepository(uow);
@@ -1748,9 +1748,10 @@ namespace Umbraco.Core.Services

        internal InstallationSummary InstallPackage(string packageFilePath, int userId = 0, bool raiseEvents = false)
        {
+            var metaData = GetPackageMetaData(packageFilePath);
+
            if (raiseEvents)
-            {
-                var metaData = GetPackageMetaData(packageFilePath);
+            {                
                if (ImportingPackage.IsRaisedEventCancelled(new ImportPackageEventArgs<string>(packageFilePath, metaData), this))
                {
                    var initEmpty = new InstallationSummary().InitEmpty();
@@ -1762,7 +1763,7 @@ namespace Umbraco.Core.Services

            if (raiseEvents)
            {
-                ImportedPackage.RaiseEvent(new ImportPackageEventArgs<InstallationSummary>(installationSummary, false), this);
+                ImportedPackage.RaiseEvent(new ImportPackageEventArgs<InstallationSummary>(installationSummary, metaData, false), this);
            }

            return installationSummary;
@@ -43,8 +43,8 @@
    <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
    </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.4\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
    </Reference>
    <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
      <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.4" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
  <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
  <package id="log4net" version="2.0.8" targetFramework="net45" />
@@ -332,6 +332,9 @@ namespace Umbraco.Tests.Persistence.Repositories
                var contentType = (IContentType)MockedContentTypes.CreateSimpleContentType2("test", "Test", propertyGroupName: "testGroup");

                Assert.AreEqual(4, contentType.PropertyTypes.Count());
+
+                // remove all templates - since they are not saved, they would break the (wtf) mapping code
+                contentType.AllowedTemplates = new ITemplate[0];

                // there is NO mapping from display to contentType, but only from save
                // to contentType, so if we want to test, let's to it properly!
@@ -24,7 +24,9 @@ namespace Umbraco.Tests.Persistence.Repositories
        [TestCase("Alpha (10)", "Alpha (2)", +1)] // this is the real stuff
        [TestCase("Kilo", "Golf (2)", +1)]
        [TestCase("Kilo (1)", "Golf (2)", +1)]
-        public void ComparerTest(string name1, string name2, int expected)
+		[TestCase("", "", 0)]
+		[TestCase(null, null, 0)]
+		public void ComparerTest(string name1, string name2, int expected)
        {
            var comparer = new SimilarNodeName.Comparer();

@@ -76,7 +78,9 @@ namespace Umbraco.Tests.Persistence.Repositories
        [TestCase(0, "Alpha", "Alpha (3)")]
        [TestCase(0, "Kilo (1)", "Kilo (1) (1)")] // though... we might consider "Kilo (2)"
        [TestCase(6, "Kilo (1)", "Kilo (1)")] // because of the id
-        public void Test(int nodeId, string nodeName, string expected)
+		[TestCase(0, "", " (1)")]
+		[TestCase(0, null, " (1)")]
+		public void Test(int nodeId, string nodeName, string expected)
        {
            var names = new[]
            {
@@ -18,7 +18,7 @@
 				<div class="control-group">
 					<label class="control-label" for="email">Email</label>
 					<div class="controls">
-						<input type="email" id="email" name="email" placeholder="you@example.com" required ng-model="installer.current.model.email" val-email />
+						<input type="email" id="email" name="email" placeholder="you@example.com" val-email required ng-model="installer.current.model.email" />
 						<small class="inline-help">Your email will be used as your login</small>
 					</div>
 				</div>
@@ -240,6 +240,7 @@
 .umb-tree .umb-tree-node-checked i:before {
 	/*check box*/
    content: "\e165" !important;
+	font-family: inherit;
 }

 a.umb-options {
@@ -261,7 +261,7 @@ angular.module("umbraco")
       $scope.openEditorOverlay = function(event, area, index, key) {
          $scope.editorOverlay = {
              view: "itempicker",
-              filter: false,
+              filter: area.$allowedEditors.length > 15,
              title: localizationService.localize("grid_insertControl"),
              availableItems: area.$allowedEditors,
              event: event,
@@ -116,8 +116,8 @@
      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.4\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
    </Reference>
    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
@@ -1023,9 +1023,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
        <WebProjectProperties>
          <UseIIS>True</UseIIS>
          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7780</DevelopmentServerPort>
+          <DevelopmentServerPort>7790</DevelopmentServerPort>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7780</IISUrl>
+          <IISUrl>http://localhost:7790</IISUrl>
          <NTLMAuthentication>False</NTLMAuthentication>
          <UseCustomServer>False</UseCustomServer>
          <CustomServerUrl>
@@ -248,7 +248,7 @@ img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|al
 thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],
 -th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],
 -span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],
-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],
+-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],
 dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],
 param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]]]>
  </validElements>
@@ -248,7 +248,7 @@ img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|al
 thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],
 -th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],
 -span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],
-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],
+-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],
 dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],
 param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]]]>
  </validElements>
@@ -271,4 +271,4 @@ param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|cla
      }
    </config>
  </customConfig>
-</tinymceConfig>
+</tinymceConfig>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.4" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
  <package id="dotless" version="1.5.2" targetFramework="net45" />
  <package id="Examine" version="0.1.89" targetFramework="net45" />
@@ -1,11 +1,7 @@
 using System;
-using System.Linq;
 using System.Web.Mvc;
 using System.Web.Security;
-using umbraco.BusinessLogic;
-using umbraco.cms.businesslogic.member;
 using Umbraco.Core;
-using Umbraco.Core.Security;
 using Umbraco.Web.Models;
 using Umbraco.Web.Mvc;

@@ -21,6 +17,13 @@ namespace Umbraco.Web.Controllers
                return CurrentUmbracoPage();
            }

+            // U4-10762 Server error with "Register Member" snippet (Cannot save member with empty name)
+            // If name field is empty, add the email address instead
+            if (string.IsNullOrEmpty(model.Name) && string.IsNullOrEmpty(model.Email) == false)
+            {
+                model.Name = model.Email;
+            }
+
            MembershipCreateStatus status;
            var member = Members.RegisterMember(model, out status, model.LoginOnSuccess);
            
@@ -36,7 +39,6 @@ namespace Umbraco.Web.Controllers
                        return Redirect(model.RedirectUrl);
                    }
                    //redirect to current page by default
-                    
                    return RedirectToCurrentUmbracoPage();
                case MembershipCreateStatus.InvalidUserName:
                    ModelState.AddModelError((model.UsernameIsEmail || model.Username == null)
@@ -65,6 +65,8 @@ namespace Umbraco.Web.Models.Mapping

                    if (source.DefaultTemplate != null)
                        dest.SetDefaultTemplate(applicationContext.Services.FileService.GetTemplate(source.DefaultTemplate));
+                    else
+                        dest.SetDefaultTemplate(null);

                    ContentTypeModelMapperExtensions.AfterMapContentTypeSaveToEntity(source, dest, applicationContext);
                });
@@ -201,10 +201,24 @@ namespace Umbraco.Web.Models.Mapping

                    var allContentPermissions = applicationContext.Services.UserService.GetPermissions(@group, true)
                        .ToDictionary(x => x.EntityId, x => x);
-                    
-                    var contentEntities = allContentPermissions.Keys.Count == 0
-                        ? new IUmbracoEntity[0]
-                        : applicationContext.Services.EntityService.GetAll(UmbracoObjectTypes.Document, allContentPermissions.Keys.ToArray());
+
+                    IEnumerable<IUmbracoEntity> contentEntities;
+                    if (allContentPermissions.Keys.Count == 0)
+                    {
+                        contentEntities = new IUmbracoEntity[0];
+                    }
+                    else
+                    {
+                        // a group can end up with way more than 2000 assigned permissions,
+                        // so we need to break them into groups in order to avoid breaking
+                        // the entity service due to too many Sql parameters.
+
+                        var list = new List<IUmbracoEntity>();
+                        contentEntities = list;
+                        var entityService = applicationContext.Services.EntityService;
+                        foreach (var idGroup in allContentPermissions.Keys.InGroupsOf(2000))
+                            list.AddRange(entityService.GetAll(UmbracoObjectTypes.Document, idGroup.ToArray()));
+                    }

                    var allAssignedPermissions = new List<AssignedContentPermissions>();
                    foreach (var entity in contentEntities)
@@ -229,7 +243,7 @@ namespace Umbraco.Web.Models.Mapping
                });

            //Important! Currently we are never mapping to multiple UserDisplay objects but if we start doing that
-            // this will cause an N+1 and we'll need to change how this works.
+            // this will cause an N+1 and we'll need to change how this works.
            config.CreateMap<IUser, UserDisplay>()
                .ForMember(detail => detail.Avatars, opt => opt.MapFrom(user => user.GetCurrentUserAvatarUrls(applicationContext.Services.UserService, applicationContext.ApplicationCache.RuntimeCache)))
                .ForMember(detail => detail.Username, opt => opt.MapFrom(user => user.Username))
@@ -253,7 +267,7 @@ namespace Umbraco.Web.Models.Mapping
                        "media/mediaRoot")))
                .ForMember(
                    detail => detail.StartContentIds,
-                    opt => opt.MapFrom(user => GetStartNodeValues(
+                    opt => opt.MapFrom(user => GetStartNodeValues(
                        user.StartContentIds.ToArray(),
                        applicationContext.Services.TextService,
                        applicationContext.Services.EntityService,
@@ -261,7 +275,7 @@ namespace Umbraco.Web.Models.Mapping
                        "content/contentRoot")))
                .ForMember(
                    detail => detail.StartMediaIds,
-                    opt => opt.MapFrom(user => GetStartNodeValues(
+                    opt => opt.MapFrom(user => GetStartNodeValues(
                        user.StartMediaIds.ToArray(),
                        applicationContext.Services.TextService,
                        applicationContext.Services.EntityService,
@@ -328,7 +342,7 @@ namespace Umbraco.Web.Models.Mapping
                    //the best we can do here is to return the user's first user group as a IUserType object
                    //but we should attempt to return any group that is the built in ones first
                    var groups = user.Groups.ToArray();
-                    detail.UserGroups = user.Groups.Select(x => x.Alias).ToArray();
+                    detail.UserGroups = user.Groups.Select(x => x.Alias).ToArray();

                    if (groups.Length == 0)
                    {
@@ -369,8 +383,8 @@ namespace Umbraco.Web.Models.Mapping
            
        }

-        private IEnumerable<EntityBasic> GetStartNodeValues(int[] startNodeIds,
-            ILocalizedTextService textService, IEntityService entityService, UmbracoObjectTypes objectType,
+        private IEnumerable<EntityBasic> GetStartNodeValues(int[] startNodeIds,
+            ILocalizedTextService textService, IEntityService entityService, UmbracoObjectTypes objectType,
            string localizedKey)
        {
            if (startNodeIds.Length > 0)
@@ -385,7 +399,7 @@ namespace Umbraco.Web.Models.Mapping
                return startNodes;
            }
            return Enumerable.Empty<EntityBasic>();
-        }
+        }

        private void MapUserGroupBasic(ServiceContext services, dynamic group, UserGroupBasic display)
        {
@@ -85,6 +85,9 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
        /// </returns>
        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
        {
+            if (source == null)
+                return null;
+
            if (IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias))
            {
                var nodeIds =
@@ -105,8 +105,8 @@
      <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.4\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
    </Reference>
    <Reference Include="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.dll</HintPath>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.4" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
  <package id="dotless" version="1.5.2" targetFramework="net45" />
  <package id="Examine" version="0.1.89" targetFramework="net45" />
  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
@@ -831,7 +831,9 @@ namespace umbraco.cms.businesslogic.packager
            var installationSummary = insPack.GetInstallationSummary(contentTypeService, dataTypeService, fileService, localizationService, macroService);
            installationSummary.PackageInstalled = true;

-            var args = new ImportPackageEventArgs<InstallationSummary>(installationSummary, false);
+            var metadata = insPack.GetMetaData();
+
+            var args = new ImportPackageEventArgs<InstallationSummary>(installationSummary, metadata, false);
            PackagingService.OnImportedPackage(args);
        }
    }
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.4" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
  <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
@@ -106,8 +106,8 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.4\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
    </Reference>
    <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
      <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.4" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
 </packages>
@@ -68,8 +68,8 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.4\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.configuration" />
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.4" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.5" targetFramework="net45" />
 </packages>
@@ -114,8 +114,8 @@
      <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
      <Name>Umbraco.Web</Name>
    </ProjectReference>
-    <Reference Include="ClientDependency.Core, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.4\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.5\lib\net45\ClientDependency.Core.dll</HintPath>
    </Reference>
    <Reference Include="System">
      <Name>System</Name>
Author	SHA1	Message	Date
Sebastiaan Jansssen	4e57e1cc18	Nicer variable name, thank to Lee Kelleher!	2018-01-19 12:50:45 +01:00
Sebastiaan Jansssen	410afffaa9	Optimizing use of newlines array	2018-01-19 12:42:04 +01:00
Claus	936e94789d	adding to tinyMceConfig.Release.config.	2018-01-19 12:21:57 +01:00
Claus	468a56e5de	Merge branch 'karltynan-dev-v7' into dev-v7	2018-01-19 11:11:53 +01:00
Claus	468ec8824a	Merge branch 'dev-v7' of git://github.com/karltynan/Umbraco-CMS into karltynan-dev-v7	2018-01-19 11:11:13 +01:00
Sebastiaan Jansssen	cad913b7a1	U4-10857 Update to ClientDependency 1.9.5	2018-01-19 08:26:34 +01:00
Sebastiaan Jansssen	382103d99d	Bump version to 7.7.9	2018-01-19 08:26:33 +01:00
Sebastiaan Janssen	cbb6b9bca0	Merge pull request #2310 from matthew-darby/U4-10495 U4-10495 - Install and customize buttons disabled	2018-01-18 18:38:37 +01:00
Sebastiaan Janssen	a1b90a50cd	Merge pull request #2343 from soreng/patch-5 Fix for U4-10733	2018-01-18 18:28:34 +01:00
Sebastiaan Janssen	9ea5855073	Merge pull request #2360 from janvanhelvoort/U4-10785 U4-10785 - Filtering of Grid Editors	2018-01-18 18:20:11 +01:00
Sebastiaan Janssen	4a37433042	Merge pull request #2372 from bjarnef/dev-v7-U4-10809 Fix checkmark tree icon, when custom font icon is used for tree icon	2018-01-18 18:00:53 +01:00
Sebastiaan Janssen	91469812d3	Merge pull request #2383 from MMasey/U4-10727 U4 10727 - If nodes with an empty name exist, it's not possible to empty recycle bin	2018-01-18 17:54:40 +01:00
Sebastiaan Janssen	68a8eb7f3f	Merge pull request #2375 from redmorello/U4-10762 U4-10762 Fix issue with empty name when registering new members from …	2018-01-18 17:40:05 +01:00
Sebastiaan Janssen	2e7baabb94	Merge pull request #2394 from umbraco/temp-u4-10813 U4-10813 - fix error with groups having a large number of permissions	2018-01-18 17:27:11 +01:00
Sebastiaan Janssen	57745fe71d	Merge pull request #2396 from leekelleher/issue/U4-10842 U4-10842 LegacyMediaPickerPropertyConverter null-reference check	2018-01-18 17:17:45 +01:00
Sebastiaan Janssen	de6f9236e7	Merge pull request #2399 from leekelleher/issue/U4-8712 U4-8712 MultipleTextstring value newline delimiter changes	2018-01-18 17:13:46 +01:00
Sebastiaan Janssen	a00c59e8b5	Merge pull request #2393 from umbraco/temp-u4-10079 U4-10079 - remove default template	2018-01-18 16:54:22 +01:00
Stephan	05c2da807f	U4-10079 - fix test	2018-01-18 15:58:51 +01:00
leekelleher	0fd8ca43d6	U4-8712 MultipleTextstring value newline delimiter changes PR #2185 goes towards resolving this, but doesn't handle the impromptu switch between the `\r\n` and `\n` newline delimiters when republishing a content node. Using an explicit array of newline chars will resolve this, e.g. `Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None)` <http://issues.umbraco.org/issue/U4-8712>	2018-01-18 12:18:51 +00:00
leekelleher	e466878925	U4-10842 LegacyMediaPickerPropertyConverter ConvertDataToSource null-reference check If a selected media node has been trashed on the source environment, when Deploy comes to transfer the node ID, because it can't transfer the media dependency, the node ID value is set to `null`. This causes an issue for the `LegacyMediaPickerPropertyConverter` and `ConvertDataToSource` throws a null-reference exception. This patch adds in a null-reference check for the `source` value. <http://issues.umbraco.org/issue/U4-10842>	2018-01-18 10:04:55 +00:00
Mikulas Tomanka	319acc199e	Merge pull request #2391 from matthew-darby/U4-10825 U4-10825 Search member by email in member section	2018-01-17 14:18:43 +01:00
Stephan	2a982f21a7	U4-10813 - fix error with groups having a large number of permissions	2018-01-17 13:07:03 +01:00
Stephan	3ff455f11d	U4-10079 - remove default template	2018-01-17 11:36:08 +01:00
Matt Darby	f49d939a2d	U4-10825 Search member by email in member section	2018-01-16 23:06:15 +08:00
Shannon	7e1e83b493	Fixes PackageInstaller event args to make sure the package metadata is passed through	2018-01-16 19:18:08 +11:00
Mike	9f6e6e4701	Add tests to SimilarNodeNameTests to check for null and "" values.	2018-01-10 20:58:10 +00:00
Mike	34ba3f3351	Merge remote-tracking branch 'upstream/dev-v7' into U4-10727	2018-01-10 20:48:28 +00:00
Mike	dcfb8b94d8	Refactor SimilarNodeName to account for null nodeName values.	2018-01-10 20:44:30 +00:00
Ian Houghton	f5f3676a56	U4-10762 Fix issue with empty name when registering new members from snippet	2018-01-09 15:51:32 +00:00
Mike	dc7b83ca6c	Add initial test fix for SimilarNodeName when a node has no name.	2018-01-08 17:30:11 +00:00
Bjarne Fyrstenborg	fcf9dcd803	Fix checkmark tree icon, when custom font icon is used for tree icon, e.g. in UCommerce	2018-01-08 14:40:31 +01:00
Sebastiaan Jansssen	3556043b55	Update to latest modelsbuilder	2018-01-08 12:44:29 +01:00
Jan van Helvoort	591a881283	Filtering of Grid Editors If there are more than 15 items, 5 rows of 3, then show the filter.	2017-12-24 15:48:16 +01:00
Søren Gregersen	50335723b0	Fix for U4-10733	2017-12-06 10:09:40 +01:00
Karl Tynan	58697eaa04	Merge pull request #1 from karltynan/karltynan-patch-1 Added small to allowed TinyMCE valid elements	2017-11-21 15:20:06 +00:00
Karl Tynan	ce58ad91b5	Added ``small`` to allowed TinyMCE valid elements We use ``small`` a lot in the RTE, and ``small`` is now considered a really useful tag in HTML5. I would like to see this in the default valid elements list for people to use out-of-the box.	2017-11-21 15:18:42 +00:00
Matt Darby	77162e4b51	Move val-email attribute before required attribute	2017-11-07 19:17:42 +07:00