U4-11149 fixed error when creating new xslt file (#2540 )

* U4-10659 added create task back for xslt files * Add fix to UI.Release.xml as well
Bumps version to 7.10.2
2018-04-09 14:47:09 +02:00 · 2018-04-09 08:30:39 +02:00 · 2018-04-09 08:28:03 +02:00 · 2018-04-06 14:46:23 +10:00 · 2018-04-05 10:15:39 +01:00 · 2018-04-04 09:44:29 +02:00
10 changed files with 18 additions and 11 deletions
@@ -11,5 +11,5 @@ using System.Resources;

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

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

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -5,7 +5,6 @@ using Umbraco.Web.UI;
 using umbraco;
 using umbraco.BusinessLogic;
 using umbraco.interfaces;
-using Umbraco.Web.umbraco.presentation.umbraco.create;

 namespace Umbraco.Tests.UI
 {
@@ -288,9 +288,12 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
                throw "args.tree cannot be null";
            }

-            if (mainTreeEventHandler) {
-                //returns a promise
-                return mainTreeEventHandler.syncTree(args);
+            if (mainTreeEventHandler) {                
+               
+                if (mainTreeEventHandler.syncTree) {
+                    //returns a promise,
+                    return mainTreeEventHandler.syncTree(args);
+                }
            }

            //couldn't sync
@@ -66,6 +66,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
        showOpenButton: false,
        showEditButton: false,
        showPathOnHover: false,
+        maxNumber: 1,
+        minNumber : 0,
        startNode: {
            query: "",
            type: "content",
@@ -28,7 +28,7 @@
            <localize key="general_add">Add</localize>
        </a>

-        <div class="umb-contentpicker__min-max-help">
+        <div class="umb-contentpicker__min-max-help" ng-if="model.config.multiPicker === true">

            <!-- Both min and max items -->
            <span ng-if="model.config.minNumber && model.config.maxNumber && model.config.minNumber !== model.config.maxNumber">
@@ -1035,9 +1035,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
        <WebProjectProperties>
          <UseIIS>True</UseIIS>
          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7101</DevelopmentServerPort>
+          <DevelopmentServerPort>7102</DevelopmentServerPort>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7101</IISUrl>
+          <IISUrl>http://localhost:7102</IISUrl>
          <NTLMAuthentication>False</NTLMAuthentication>
          <UseCustomServer>False</UseCustomServer>
          <CustomServerUrl>
@@ -19,6 +19,7 @@
    <header>Macro</header>
    <usercontrol>/create/xslt.ascx</usercontrol>
    <tasks>
+	  <create assembly="umbraco" type="XsltTasks" />
      <delete assembly="umbraco" type="XsltTasks" />
    </tasks>
  </nodeType>
@@ -19,6 +19,7 @@
    <header>Macro</header>
    <usercontrol>/create/xslt.ascx</usercontrol>
    <tasks>
+      <create assembly="umbraco" type="XsltTasks" />
      <delete assembly="umbraco" type="XsltTasks" />
    </tasks>
  </nodeType>
@@ -2,9 +2,10 @@ using System.Linq;
 using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.member;
+using Umbraco.Web;
 using Umbraco.Web.UI;

-namespace Umbraco.Web.umbraco.presentation.umbraco.create
+namespace umbraco
 {
    public class MemberGroupTasks : LegacyDialogTask
    {
Author	SHA1	Message	Date
Dave Woestenborghs	354505fde3	U4-11149 fixed error when creating new xslt file (#2540 ) * U4-10659 added create task back for xslt files * Add fix to UI.Release.xml as well	2018-04-09 14:47:09 +02:00
Sebastiaan Janssen	95d40049f5	Bumps version to 7.10.2	2018-04-09 08:30:39 +02:00
Sebastiaan Janssen	f003c3602c	Merge pull request #2545 from dawoe/temp-U4-11155 U4-11155 fixed error when creating member groups	2018-04-09 08:28:03 +02:00
Shannon Deminick	e25d648f44	Merge pull request #2556 from dawoe/temp-U4-11167 U4-11167 Fixes rare syncTree error	2018-04-06 14:46:23 +10:00
Warren Buckley	43e32e66b6	Merge pull request #2550 from dawoe/temp-U4-11161 U4-11161 fix for adding multiple items in a single content picker	2018-04-05 10:15:39 +01:00
Dave Woestenborghs	859cb6ce1a	U4-11167 removed the time out..only check if the syncTree method exists	2018-04-04 09:44:29 +02:00
Dave Woestenborghs	27b19a0a33	U4-11167 only wrap in time out when syncTree method is undefined	2018-04-03 07:37:37 +02:00
Dave Woestenborghs	f6263aad5b	U4-11167 wrap syncTree method to handle rare occasions where it is not defined yet	2018-03-31 15:09:30 +02:00
Dave Woestenborghs	d1eb6b1aa8	U4-11161 don't show help text when it's not a multipicker	2018-03-28 17:07:56 +02:00
Dave Woestenborghs	458d023ff4	U4-11161 set min and max number in default config	2018-03-28 17:03:35 +02:00