mixcore · nhathoang989 · Sep 12, 2021 · Sep 12, 2021
diff --git a/src/Mix.Cms.Api.RestFul/Controllers/v1/MixDatabaseDatas/ApiMixDatabaseDataController.cs b/src/Mix.Cms.Api.RestFul/Controllers/v1/MixDatabaseDatas/ApiMixDatabaseDataController.cs
@@ -44,22 +44,21 @@ public override async Task<ActionResult<PaginationModel<FormViewModel>>> Get()
         [HttpGet("init/{mixDatabase}")]
         public async Task<ActionResult<FormViewModel>> Init(string mixDatabase)
         {
-            var formData = Helper.GetFormDataAsync(mixDatabase, _lang);
+            var formData = await Helper.GetFormDataAsync(mixDatabase, _lang);
             return formData != null
                 ? Ok(formData)
                 : BadRequest(mixDatabase);
         }
 
         [HttpPost("save-data/{mixDatabase}")]
-        [HttpPost("save-data/{mixDatabase}/{sendMail}/{sendSms}")]
         public async Task<ActionResult<FormViewModel>> SaveData([FromRoute] string mixDatabase, bool? sendMail, bool? sendSms, [FromBody] JObject data)
         {
             var formData = await Helper.GetFormDataAsync(mixDatabase, _lang);
             if (formData != null)
             {
                 formData.Obj = data;
                 var result = await SaveAsync(formData, true);
-                if (result.IsSucceed && sendMail.HasValue && sendMail.Value)
+                if (result.IsSucceed)
                 {
                     await Helper.SendMail(mixDatabase, _lang, data);
                 }

diff --git a/src/Mix.Cms.Lib/ViewModels/MixDatabaseDatas/Helper.cs b/src/Mix.Cms.Lib/ViewModels/MixDatabaseDatas/Helper.cs
@@ -117,6 +117,7 @@ private static string GetEdmBody(string template, JObject data)
                     template = template.Replace($"[[{colName}]]", val?.Value<string>() ?? m.Groups[0].Value);
                 }
             }
+            template = template.Replace($"[[createdDateTime]]", DateTime.Now.ToLongDateString());
             return template;
         }
 
@@ -240,7 +241,7 @@ public static async Task<RepositoryResponse<FormViewModel>> SaveObjAsync(string
             culture ??= MixService.GetAppSetting<string>("DefaultCulture");
             string id = obj.Value<string>("id");
             FormViewModel formData;
-            
+
             if (id == null)
             {
                 formData = await GetFormDataAsync(databaseName, culture);
@@ -252,7 +253,7 @@ public static async Task<RepositoryResponse<FormViewModel>> SaveObjAsync(string
             }
 
             if (formData != null)
-            {                
+            {
                 formData.ParentId = parentId;
                 if (parentType.HasValue)
                 {
@@ -277,9 +278,13 @@ public static async Task<FormViewModel> GetFormDataAsync(string mixDatabase, str
                     MixDatabaseId = getDatabase.Data.Id,
                     MixDatabaseName = getDatabase.Data.Name,
                     Status = MixContentStatus.Published,
-                    Columns = getDatabase.Data.Columns
+                    Columns = getDatabase.Data.Columns,
+                    Obj = new()
                 };
-                result.ExpandView();
+                foreach (var item in result.Columns)
+                {
+                    result.Obj.Add(new JProperty(item.Name, item.DefaultValue ?? string.Empty));
+                }
                 return result;
             }
             return null;

diff --git a/src/Mix.Cms.Lib/ViewModels/MixPages/UpdateViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixPages/UpdateViewModel.cs
@@ -496,15 +496,10 @@ private void GenerateSEO(MixCmsContext _context = null, IDbContextTransaction _t
         {
             // Load Actived Modules
             var result = MixPageModules.ReadMvcViewModel.Repository.GetModelListBy(m => m.PageId == Id && m.Specificulture == Specificulture
-            , context, transaction).Data;
-            result.ForEach(nav =>
-            {
-                nav.IsActived = true;
-            });
-            var moduleids = result.Select(m => m.ModuleId);
+            , context, transaction).Data;            
             // Load inactived modules
             var otherModules = MixModules.ReadListItemViewModel.Repository.GetModelListBy(
-                m => m.Specificulture == Specificulture && !moduleids.Any(r => r == m.Id)
+                m => m.Specificulture == Specificulture
                 , context, transaction).Data;
             foreach (var item in otherModules)
             {
@@ -514,10 +509,11 @@ private void GenerateSEO(MixCmsContext _context = null, IDbContextTransaction _t
                     PageId = Id,
                     ModuleId = item.Id,
                     Image = item.ImageUrl,
-                    Description = item.Title
+                    Description = item.Title,
+                    IsActived = result.Any(m=>m.ModuleId == item.Id)
                 });
             }
-            return result.OrderBy(m => m.Priority).ToList();
+            return result.OrderByDescending(m=>m.IsActived).ThenBy(m => m.Priority).ToList();
         }
 
         #endregion Expands