fix init cms

mixcore · Aug 12, 2021 · d6ff307 · d6ff307
1 parent 39ab77d
commit d6ff307
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 11 deletions.
diff --git a/src/Mix.Cms.Lib/Migrations/MsSqlMixCms/20210807192439_UpdateDbName.cs b/src/Mix.Cms.Lib/Migrations/MsSqlMixCms/20210807192439_UpdateDbName.cs
@@ -20,14 +20,18 @@ protected override void Up(MigrationBuilder migrationBuilder)
             migrationBuilder.UpdateData("mix_database_column", "MixDatabaseName", "sys_additional_field_post", "MixDatabaseName", "sys_additional_column_post");
             migrationBuilder.UpdateData("mix_database_column", "MixDatabaseName", "sys_additional_field_module", "MixDatabaseName", "sys_additional_column_module");
             migrationBuilder.UpdateData("mix_database_column", "MixDatabaseName", "sys_additional_field", "MixDatabaseName", "sys_additional_column");
+
+            migrationBuilder.UpdateData(
+                "mix_database_column", 
+                new string[] { "MixDatabaseName", "Name" }, 
+                new string[] { "post_type", "mix_database_name" }, "Name", "databaseName");
 
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_page", "MixDatabaseName", "sys_additional_column_page");
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_post", "MixDatabaseName", "sys_additional_column_post");
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_module", "MixDatabaseName", "sys_additional_column_module");
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field", "MixDatabaseName", "sys_additional_column");
 
             migrationBuilder.UpdateData("mix_post", "Type", "sys_additional_field_post", "Type", "sys_additional_column_post");
-
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)

diff --git a/src/Mix.Cms.Lib/Migrations/MySqlMixCms/20210807193345_UpdateDbName.cs b/src/Mix.Cms.Lib/Migrations/MySqlMixCms/20210807193345_UpdateDbName.cs
@@ -21,6 +21,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
             migrationBuilder.UpdateData("mix_database_column", "MixDatabaseName", "sys_additional_field_module", "MixDatabaseName", "sys_additional_column_module");
             migrationBuilder.UpdateData("mix_database_column", "MixDatabaseName", "sys_additional_field", "MixDatabaseName", "sys_additional_column");
 
+            migrationBuilder.UpdateData(
+               "mix_database_column",
+               new string[] { "MixDatabaseName", "Name" },
+               new string[] { "post_type", "mix_database_name" }, "Name", "databaseName");
+
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_page", "MixDatabaseName", "sys_additional_column_page");
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_post", "MixDatabaseName", "sys_additional_column_post");
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_module", "MixDatabaseName", "sys_additional_column_module");

diff --git a/src/Mix.Cms.Lib/Migrations/PostgresqlMixCms/20210807193422_UpdateDbName.cs b/src/Mix.Cms.Lib/Migrations/PostgresqlMixCms/20210807193422_UpdateDbName.cs
@@ -21,6 +21,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
             migrationBuilder.UpdateData("mix_database_column", "MixDatabaseName", "sys_additional_field_module", "MixDatabaseName", "sys_additional_column_module");
             migrationBuilder.UpdateData("mix_database_column", "MixDatabaseName", "sys_additional_field", "MixDatabaseName", "sys_additional_column");
 
+            migrationBuilder.UpdateData(
+               "mix_database_column",
+               new string[] { "MixDatabaseName", "Name" },
+               new string[] { "post_type", "mix_database_name" }, "Name", "databaseName");
+
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_page", "MixDatabaseName", "sys_additional_column_page");
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_post", "MixDatabaseName", "sys_additional_column_post");
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_module", "MixDatabaseName", "sys_additional_column_module");

diff --git a/src/Mix.Cms.Lib/Migrations/SqliteMixCms/20210807193245_UpdateDbName.cs b/src/Mix.Cms.Lib/Migrations/SqliteMixCms/20210807193245_UpdateDbName.cs
@@ -21,6 +21,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
             migrationBuilder.UpdateData("mix_database_column", "MixDatabaseName", "sys_additional_field_module", "MixDatabaseName", "sys_additional_column_module");
             migrationBuilder.UpdateData("mix_database_column", "MixDatabaseName", "sys_additional_field", "MixDatabaseName", "sys_additional_column");
 
+            migrationBuilder.UpdateData(
+               "mix_database_column",
+               new string[] { "MixDatabaseName", "Name" },
+               new string[] { "post_type", "mix_database_name" }, "Name", "databaseName");
+
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_page", "MixDatabaseName", "sys_additional_column_page");
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_post", "MixDatabaseName", "sys_additional_column_post");
             migrationBuilder.UpdateData("mix_database_data_value", "MixDatabaseName", "sys_additional_field_module", "MixDatabaseName", "sys_additional_column_module");

diff --git a/src/Mix.Cms.Lib/ViewModels/MixThemes/Helper.cs b/src/Mix.Cms.Lib/ViewModels/MixThemes/Helper.cs
@@ -130,7 +130,7 @@ public static async Task<RepositoryResponse<InitViewModel>> InitTheme(string mod
 
         public static async Task<RepositoryResponse<UpdateViewModel>> InstallThemeAsync(JObject theme, string createdBy, string culture, IProgress<int> progress, HttpService httpService)
         {
-            string name = theme.Value<string>("title");
+            string name = theme.Value<string>("name");
             var newtheme = new UpdateViewModel()
             {
                 Title = name,

diff --git a/src/Mix.Cms.Lib/ViewModels/SiteStructureViewModel.cs b/src/Mix.Cms.Lib/ViewModels/SiteStructureViewModel.cs
@@ -18,6 +18,12 @@ public class SiteStructureViewModel
         [JsonProperty("isIncludeAssets")]
         public bool IsIncludeAssets { get; set; } = true;
 
+        [JsonProperty("isIncludeTemplates")]
+        public bool IsIncludeTemplates { get; set; } = true;
+
+        [JsonProperty("isIncludeConfigurations")]
+        public bool IsIncludeConfigurations { get; set; } = true;
+
         [JsonProperty("createdBy")]
         public string CreatedBy { get; set; }
 
@@ -37,10 +43,10 @@ public class SiteStructureViewModel
         public List<MixTemplates.ImportViewModel> Templates { get; set; }
 
         [JsonProperty("configurations")]
-        public List<MixConfigurations.ImportViewModel> Configurations { get; set; }
+        public List<MixConfigurations.ImportViewModel> Configurations { get; set; } = new List<MixConfigurations.ImportViewModel>();
 
         [JsonProperty("languages")]
-        public List<MixLanguages.ImportViewModel> Languages { get; set; }
+        public List<MixLanguages.ImportViewModel> Languages { get; set; } = new List<MixLanguages.ImportViewModel>();
 
         [JsonProperty("relatedData")]
         public List<MixDatabaseDataAssociations.ImportViewModel> RelatedData { get; set; } = new List<MixDatabaseDataAssociations.ImportViewModel>();
@@ -86,16 +92,22 @@ public RepositoryResponse<string> ExportSelectedItemsAsync()
             var result = new RepositoryResponse<string>() { IsSucceed = true };
             try
             {
-                Configurations = MixConfigurations.ImportViewModel.Repository.GetModelListBy(
-                    m => m.Specificulture == Specificulture, context, transaction).Data;
-                Languages = MixLanguages.ImportViewModel.Repository.GetModelListBy(
-                    m => m.Specificulture == Specificulture, context, transaction).Data;
+                if (IsIncludeConfigurations)
+                {
+                    Configurations = MixConfigurations.ImportViewModel.Repository.GetModelListBy(
+                        m => m.Specificulture == Specificulture, context, transaction).Data;
+                    Languages = MixLanguages.ImportViewModel.Repository.GetModelListBy(
+                        m => m.Specificulture == Specificulture, context, transaction).Data;
+                }
 
                 ExportPages(context, transaction);
                 ExportModules(context, transaction);
                 ExportMixDatabasesAsync(context, transaction);
                 ExportDatas(context, transaction);
-                ExportTemplates(context, transaction);
+                if (IsIncludeTemplates)
+                {
+                    ExportTemplates(context, transaction);
+                }
                 return result;
             }
             catch (Exception ex) // TODO: Add more specific exeption types instead of Exception only

diff --git a/src/Mix.Cms.Web/MixContent/data/_blank.zip b/src/Mix.Cms.Web/MixContent/data/_blank.zip
diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/views/app-portal/components/additional-column/view.html b/src/Mix.Cms.Web/wwwroot/mix-app/views/app-portal/components/additional-column/view.html
diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/views/app-portal/pages/theme/export.html b/src/Mix.Cms.Web/wwwroot/mix-app/views/app-portal/pages/theme/export.html
@@ -1 +1 @@
-<aside class="bd-sidebar sub-sidebar"><nav class="bd-links p-3" aria-label="Sub-section navigation"><div class="btn-group w-100" role="group"><button id="btnToSubmit" type="button" ng-click="export()" class="btn btn-primary text-white"><i class="fa fa-save"></i> <span ng-bind="translate('Export')"></span></button></div></nav></aside><div class="content-body py-3 pe-3"><h3>Export theme and data</h3><p class="text-subtitle text-muted">Use the filter side bar on the right to filter and search your themes.</p><section class="" ng-init="getExportData()"><form id="frm-theme" ng-class="{'submitted': submitted}" ng-submit="export()"><div class="row justify-content-md-center"><div class="col-12 mb-3"><div class="form-check form-switch"><input type="checkbox" class="form-check-input" ng-model="exportData.isIncludeAssets"> <label class="custom-control-label" for="switchSelectAllSetData">Include Assets</label></div></div><div class=""><tabs-v><pane-v header="Pages" class="card"><div class="card-body"><theme-export-pages export-data="exportData" selected-export="selectedExport"></theme-export-pages></div></pane-v><pane-v header="Modules" class="card"><div class="card-body"><theme-export-modules export-data="exportData" selected-export="selectedExport"></theme-export-modules></div></pane-v><pane-v header="Database" class="card"><div class="card-body"><theme-export-mix-databases export-data="exportData" selected-export="selectedExport"></theme-export-mix-databases></div></pane-v><pane-v header="Posts" class="card"><div class="card-body"><theme-export-posts export-data="exportData" selected-export="selectedExport"></theme-export-posts></div></pane-v></tabs-v></div></div></form></section></div>
+<aside class="bd-sidebar sub-sidebar"><nav class="bd-links p-3" aria-label="Sub-section navigation"><div class="btn-group w-100" role="group"><button id="btnToSubmit" type="button" ng-click="export()" class="btn btn-primary text-white"><i class="fa fa-save"></i> <span ng-bind="translate('Export')"></span></button></div></nav></aside><div class="content-body py-3 pe-3"><h3>Export theme and data</h3><p class="text-subtitle text-muted">Use the filter side bar on the right to filter and search your themes.</p><section class="" ng-init="getExportData()"><form id="frm-theme" ng-class="{'submitted': submitted}" ng-submit="export()"><div class="row justify-content-md-center"><div class="col-12 mb-3"><div class="form-check form-switch"><input type="checkbox" class="form-check-input" ng-model="exportData.isIncludeAssets"> <label class="custom-control-label" for="switchSelectAllSetData">Include Assets</label></div><div class="form-check form-switch"><input type="checkbox" class="form-check-input" ng-model="exportData.isIncludeTemplates"> <label class="custom-control-label" for="switchSelectAllSetData">Include Templates</label></div><div class="form-check form-switch"><input type="checkbox" class="form-check-input" ng-model="exportData.isIncludeConfigurations"> <label class="custom-control-label" for="switchSelectAllSetData">Include Configurations</label></div></div><div class=""><tabs-v><pane-v header="Pages" class="card"><div class="card-body"><theme-export-pages export-data="exportData" selected-export="selectedExport"></theme-export-pages></div></pane-v><pane-v header="Modules" class="card"><div class="card-body"><theme-export-modules export-data="exportData" selected-export="selectedExport"></theme-export-modules></div></pane-v><pane-v header="Database" class="card"><div class="card-body"><theme-export-mix-databases export-data="exportData" selected-export="selectedExport"></theme-export-mix-databases></div></pane-v><pane-v header="Posts" class="card"><div class="card-body"><theme-export-posts export-data="exportData" selected-export="selectedExport"></theme-export-posts></div></pane-v></tabs-v></div></div></form></section></div>