Merge branch 'main' of https://github.com/patrickdemooij9/uSeoToolkit…

….Umbraco
patrickdemooij9 · Jul 10, 2022 · 718a757 · 718a757
2 parents 2582a08 + c7f8b3c
commit 718a757
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/....Umbraco.Common/App_Plugins/SeoToolkit/ContentApps/DocumentType/seoSettings.controller.js b/....Umbraco.Common/App_Plugins/SeoToolkit/ContentApps/DocumentType/seoSettings.controller.js
@@ -43,7 +43,7 @@
         }
 
         function save() {
-            $http.post("backoffice/SeoToolkit/SeoSettings/Set",
+            return $http.post("backoffice/SeoToolkit/SeoSettings/Set",
                 {
                     contentTypeId: $scope.model.id,
                     enabled: vm.model.enableSeoSettings
@@ -58,11 +58,11 @@
 
         $scope.$on("formSubmitting",
             function () {
-                save();
-
-                if (vm.model.enableSeoSettings) {
-                    $scope.$broadcast("seoSettingsSubmitting");
-                }
+                save().then(function() {
+                    if (vm.model.enableSeoSettings) {
+                        $scope.$broadcast("seoSettingsSubmitting");
+                    }
+                });
             });
 
         init();

diff --git a/src/SeoToolkit.Umbraco.Sitemap.Core/Migrations/SitemapChangeFrequencyOptionalMigration.cs b/src/SeoToolkit.Umbraco.Sitemap.Core/Migrations/SitemapChangeFrequencyOptionalMigration.cs
@@ -1,4 +1,7 @@
-using Umbraco.Cms.Infrastructure.Migrations;
+using NPoco;
+using SeoToolkit.Umbraco.Sitemap.Core.Models.Database;
+using Umbraco.Cms.Infrastructure.Migrations;
+using Umbraco.Extensions;
 
 namespace SeoToolkit.Umbraco.Sitemap.Core.Migrations
 {
@@ -10,7 +13,18 @@ public SitemapChangeFrequencyOptionalMigration(IMigrationContext context) : base
 
         protected override void Migrate()
         {
-            if (ColumnExists("SeoToolkitSitemapPageType", "ChangeFrequency"))
+            if (!ColumnExists("SeoToolkitSitemapPageType", "ChangeFrequency")) return;
+
+            if (DatabaseType == DatabaseType.SQLite)
+            {
+                //SQLite doesn't support normal altering of columns. https://github.com/umbraco/Umbraco-CMS/issues/12676
+                Database.Execute("ALTER TABLE SeoToolkitSitemapPageType RENAME TO old_SeoToolkitSitemapPageType;");
+                Create.Table<SitemapPageTypeEntity>().Do();
+                Database.InsertBulk(Database.Fetch<SitemapPageTypeEntity>(Sql()
+                    .SelectAll()
+                    .From("old_SeoToolkitSitemapPageType")));
+            }
+            else
             {
                 Alter.Table("SeoToolkitSitemapPageType").AlterColumn("ChangeFrequency").AsString().Nullable().Do();
             }