Merge pull request #1969 from umbraco/temp-U4-9974

U4-9974 EnablePropertyValueConverter does the opposite

build/UmbracoVersion.txt

@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.6.2
+7.6.3

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.6.2")]
-[assembly: AssemblyInformationalVersion("7.6.2")]
+[assembly: AssemblyFileVersion("7.6.3")]
+[assembly: AssemblyInformationalVersion("7.6.3")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.6.2");
+        private static readonly Version Version = new Version("7.6.3");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddRelationTypeForDocumentOnDelete.cs

@@ -2,6 +2,7 @@
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZero
@@ -16,7 +17,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
 
         public override void Up()
         {
-            var exists = Context.Database.FirstOrDefault<RelationTypeDto>("WHERE alias=@alias", new {alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias});
+            var exists = Context.Database.FirstOrDefault<RelationTypeDtoCapture>("WHERE alias=@alias", new {alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias});
             if (exists == null)
             {
                 Insert.IntoTable("umbracoRelationType").Row(new
@@ -28,13 +29,42 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
                     alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias
                 });
             }
-
-            
-
         }
 
         public override void Down()
+        { }
+
+        // need to capture the DTO as it is modified in later migrations
+
+        [TableName("umbracoRelationType")]
+        [PrimaryKey("id")]
+        [ExplicitColumns]
+        internal class RelationTypeDtoCapture
         {
+            public const int NodeIdSeed = 3;
+
+            [Column("id")]
+            [PrimaryKeyColumn(IdentitySeed = NodeIdSeed)]
+            public int Id { get; set; }
+
+            [Column("dual")]
+            public bool Dual { get; set; }
+
+            [Column("parentObjectType")]
+            public Guid ParentObjectType { get; set; }
+
+            [Column("childObjectType")]
+            public Guid ChildObjectType { get; set; }
+
+            [Column("name")]
+            [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoRelationType_name")]
+            public string Name { get; set; }
+
+            [Column("alias")]
+            [NullSetting(NullSetting = NullSettings.Null)]
+            [Length(100)]
+            [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoRelationType_alias")]
+            public string Alias { get; set; }
         }
     }
 }

src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js

@@ -68,7 +68,7 @@ function logResource($q, $http, umbRequestHelper) {
                        "logApiBaseUrl",
                        "GetCurrentUserLog",
                        [{ logtype: type, sinceDate: since }])),
-               'Failed to retrieve user data for id ' + id);
+               'Failed to retrieve log data for current user of type ' + type + ' since ' + since);
         },
 
         /**
@@ -99,7 +99,7 @@ function logResource($q, $http, umbRequestHelper) {
                        "logApiBaseUrl",
                        "GetLog",
                        [{ logtype: type, sinceDate: since }])),
-               'Failed to retrieve user data for id ' + id);
+               'Failed to retrieve log data of type ' + type + ' since ' + since);
         }
     };
 }

src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js

@@ -103,15 +103,15 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
          * @description
          * This returns a promise with an underlying http call, it is a helper method to reduce
          *  the amount of duplicate code needed to query http resources and automatically handle any 
-         *  500 Http server errors. 
+         *  Http errors. See /docs/source/using-promises-resources.md
          *
-         * @param {object} opts A mixed object which can either be a `string` representing the error message to be
-         *   returned OR an `object` containing either:
+         * @param {object} opts A mixed object which can either be a string representing the error message to be
+         *   returned OR an object containing either:
          *     { success: successCallback, errorMsg: errorMessage }
          *          OR
          *     { success: successCallback, error: errorCallback }
-         *   In both of the above, the successCallback must accept these parameters: `data`, `status`, `headers`, `config`
-         *   If using the errorCallback it must accept these parameters: `data`, `status`, `headers`, `config`
+         *   In both of the above, the successCallback must accept these parameters: data, status, headers, config
+         *   If using the errorCallback it must accept these parameters: data, status, headers, config
          *   The success callback must return the data which will be resolved by the deferred object.
          *   The error callback must return an object containing: {errorMsg: errorMessage, data: originalData, status: status }
          */

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -2376,9 +2376,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7620</DevelopmentServerPort>
+          <DevelopmentServerPort>7630</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7620</IISUrl>
+          <IISUrl>http://localhost:7630</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web.UI/umbraco_client/Editors/EditXslt.js

@@ -37,7 +37,7 @@
                 codeVal = UmbEditor.GetCode();
             }
             umbraco.presentation.webservices.codeEditorSave.SaveXslt(
-                fileName, self._opts.originalFileName, codeVal, self._opts.skipTestingCheckBox.is(':checked'),
+                fileName, self._opts.originalFileName, codeVal, true,
                 function (t) { self.submitSucces(t); },
                 function (t) { self.submitFailure(t); });
 

src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyRelatedLinksEditorValueConvertor.cs

@@ -21,12 +21,9 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
 
         public override bool IsConverter(PublishedPropertyType propertyType)
         {
-            if (propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.RelatedLinks2Alias))
-                return true;
-            
             if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters == false)
             {
-                return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.RelatedLinksAlias);                
+                return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.RelatedLinksAlias);
             }
             return false;
         }

src/Umbraco.Web/PropertyEditors/ValueConverters/MediaPickerPropertyConverter.cs

@@ -12,6 +12,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
@@ -122,7 +123,14 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
         /// </returns>
         public override bool IsConverter(PublishedPropertyType propertyType)
         {
-            return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MediaPicker2Alias);
+            if (propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MediaPicker2Alias))
+                return true;
+
+            if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters)
+            {
+                return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MediaPickerAlias);
+            }
+            return false;
         }
 
         /// <summary>

src/Umbraco.Web/PropertyEditors/ValueConverters/MemberPickerPropertyConverter.cs

@@ -20,11 +20,11 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             if (propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MemberPicker2Alias))
                 return true;
 
-            if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters == false)
+            if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters)
             {
                 return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MemberPickerAlias);
             }
-            return false;            
+            return false;
         }
 
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)

src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs

@@ -55,11 +55,11 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             if (propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MultiNodeTreePicker2Alias))
                 return true;
 
-            if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters == false)
+            if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters)
             {
                 return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MultiNodeTreePickerAlias);
             }
-            return false;            
+            return false;
         }
 
         /// <summary>

src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksEditorValueConvertor.cs

@@ -56,11 +56,11 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             if (propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.RelatedLinks2Alias))
                 return true;
 
-            if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters == false)
+            if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters)
             {
                 return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.RelatedLinksAlias);
             }
-            return false;            
+            return false;
         }
 
         /// <summary>

src/Umbraco.Web/umbraco.presentation/helper.cs

@@ -137,12 +137,16 @@ namespace umbraco
                                     attributeValue = StateHelper.GetCookieValue(keyName);
                                 break;
                             case "#":
+                                if (pageElements == null)
+                                    pageElements = GetPageElements();
                                 if (pageElements[keyName] != null)
                                     attributeValue = pageElements[keyName].ToString();
                                 else
                                     attributeValue = "";
                                 break;
                             case "$":
+                                if (pageElements == null)
+                                    pageElements = GetPageElements();
                                 if (pageElements[keyName] != null && pageElements[keyName].ToString() != string.Empty)
                                 {
                                     attributeValue = pageElements[keyName].ToString();
@@ -190,6 +194,14 @@ namespace umbraco
             return attributeValue;
         }
 
+        private static IDictionary GetPageElements()
+        {
+            IDictionary pageElements = null;
+            if (HttpContext.Current.Items["pageElements"] != null)
+                pageElements = (IDictionary)HttpContext.Current.Items["pageElements"];
+            return pageElements;
+        }
+
         [UmbracoWillObsolete("We should really obsolete that one.")]
         public static string SpaceCamelCasing(string text)
         {