diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenZeroOne/RemoveCachedRecycleMediaXml.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenZeroOne/RemoveCachedRecycleMediaXml.cs new file mode 100644 index 0000000000..53b2728728 --- /dev/null +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenZeroOne/RemoveCachedRecycleMediaXml.cs @@ -0,0 +1,33 @@ +using System; +using Umbraco.Core.Configuration; +using Umbraco.Core.PropertyEditors; +using Umbraco.Core.Services; + +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenZeroOne +{ + /// + /// Due to this bug: http://issues.umbraco.org/issue/U4-3820 we need to remove the cached media + /// xml found in the cmsContentXml table for any media that has been recycled. + /// + [Migration("7.0.1", 1, GlobalSettings.UmbracoMigrationName)] + public class RemoveCachedRecycleMediaXml : MigrationBase + { + public override void Up() + { + //now that the controlId column is renamed and now a string we need to convert + if (Context == null || Context.Database == null) return; + + Execute.Code(database => + { + var mediasvc = (MediaService) ApplicationContext.Current.Services.MediaService; + mediasvc.RebuildXmlStructures(); + + return string.Empty; + }); + } + + public override void Down() + { + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 880673ef6e..5c73fc38db 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -339,6 +339,7 @@ + diff --git a/src/Umbraco.Tests/PluginManagerTests.cs b/src/Umbraco.Tests/PluginManagerTests.cs index 14a73b333a..8d0de407ec 100644 --- a/src/Umbraco.Tests/PluginManagerTests.cs +++ b/src/Umbraco.Tests/PluginManagerTests.cs @@ -336,29 +336,29 @@ namespace Umbraco.Tests var types = PluginManager.Current.ResolveXsltExtensions(); Assert.AreEqual(3, types.Count()); } - - ///// - ///// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types - ///// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way. - ///// - //[Test] - //public void TypeList_Resolves_Explicit_Types() - //{ - // var types = new HashSet(); - // var propEditors = new PluginManager.TypeList(PluginManager.TypeResolutionKind.FindAllTypes); - // propEditors.AddType(typeof (LabelPropertyEditor)); - // types.Add(propEditors); + /// + /// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types + /// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way. + /// + [Test] + public void TypeList_Resolves_Explicit_Types() + { + var types = new HashSet(); - // var found = types.SingleOrDefault(x => x.IsTypeList(PluginManager.TypeResolutionKind.FindAllTypes)); + var propEditors = new PluginManager.TypeList(PluginManager.TypeResolutionKind.FindAllTypes); + propEditors.AddType(typeof(LabelPropertyEditor)); + types.Add(propEditors); - // Assert.IsNotNull(found); + var found = types.SingleOrDefault(x => x.IsTypeList(PluginManager.TypeResolutionKind.FindAllTypes)); - // //This should not find a type list of this type - // var shouldNotFind = types.SingleOrDefault(x => x.IsTypeList(PluginManager.TypeResolutionKind.FindAllTypes)); + Assert.IsNotNull(found); - // Assert.IsNull(shouldNotFind); - //} + //This should not find a type list of this type + var shouldNotFind = types.SingleOrDefault(x => x.IsTypeList(PluginManager.TypeResolutionKind.FindAllTypes)); + + Assert.IsNull(shouldNotFind); + } [XsltExtension("Blah.Blah")] public class MyXsltExtension diff --git a/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js new file mode 100644 index 0000000000..76a53929de --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/common/authorizeupgrade.controller.js @@ -0,0 +1,32 @@ + +/** + * @ngdoc controller + * @name Umbraco.MainController + * @function + * + * @description + * The controller for the AuthorizeUpgrade login page + * + */ +function AuthorizeUpgradeController($scope, $window) { + + //Add this method to the scope - this method will be called by the login dialog controller when the login is successful + // then we'll handle the redirect. + $scope.submit = function (event) { + + var qry = $window.location.search.trimStart("?").split("&"); + var redir = _.find(qry, function(item) { + return item.startsWith("redir="); + }); + if (redir) { + $window.location = decodeURIComponent(redir.split("=")[1]); + } + else { + $window.location = "/"; + } + + }; + +} + +angular.module('umbraco').controller("Umbraco.AuthorizeUpgradeController", AuthorizeUpgradeController); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js index aea8128f01..c9e7adabe2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js @@ -35,7 +35,7 @@ userService.authenticate(login, password) .then(function (data) { - $scope.submit(true); + $scope.submit(true); }, function (reason) { $scope.errorMsg = reason.errorMsg; diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 0b4586ebdf..69dd00ce1a 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2157,6 +2157,7 @@ + @@ -2605,7 +2606,7 @@ - 11.0 + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -2623,9 +2624,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" True True - 7010 + 7000 / - http://localhost:7010 + http://localhost:7000 False False diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config index 889f02f6ed..8ff4de9cfd 100644 --- a/src/Umbraco.Web.UI/config/ClientDependency.config +++ b/src/Umbraco.Web.UI/config/ClientDependency.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - +