mixcore · nhathoang989 · Sep 8, 2021 · Sep 8, 2021 · Sep 8, 2021 · Sep 8, 2021
diff --git a/src/Mix.Cms.Api/Controllers/v1/ApiFileController.cs b/src/Mix.Cms.Api/Controllers/v1/ApiFileController.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
+using Mix.Cms.Lib.Constants;
 using Mix.Cms.Lib.Models.Cms;
 using Mix.Cms.Lib.SignalR.Hubs;
 using Mix.Cms.Lib.ViewModels;
@@ -102,6 +103,10 @@ public RepositoryResponse<FileViewModel> Save([FromBody] FileViewModel model)
         public RepositoryResponse<FilePageViewModel> GetList([FromBody] RequestPaging request)
         {
             ParseRequestPagingDate(request);
+            if (!request.Key.StartsWith(MixFolders.WebRootPath))
+            {
+                return new();
+            }
             var files = MixFileRepository.Instance.GetTopFiles(request.Key);
             var directories = MixFileRepository.Instance.GetTopDirectories(request.Key);
             return new RepositoryResponse<FilePageViewModel>()

diff --git a/src/Mix.Cms.Lib/ViewModels/MixModules/ReadMvcViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixModules/ReadMvcViewModel.cs
@@ -178,8 +178,8 @@ public string EdmTemplatePath
             }
         }
 
-        [JsonProperty("attributeData")]
-        public MixDatabaseDataAssociations.ReadMvcViewModel AttributeData { get; set; }
+        [JsonProperty("additionalData")]
+        public MixDatabaseDataAssociations.ReadMvcViewModel AdditionalData { get; set; }
 
         #endregion Views
 
@@ -219,7 +219,7 @@ private void LoadAttributes(MixCmsContext _context, IDbContextTransaction _trans
             var getAttrs = MixDatabases.UpdateViewModel.Repository.GetSingleModel(m => m.Name == MixConstants.MixDatabaseName.ADDITIONAL_COLUMN_MODULE, _context, _transaction);
             if (getAttrs.IsSucceed)
             {
-                AttributeData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
+                AdditionalData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
                 a => a.ParentId == Id.ToString() && a.Specificulture == Specificulture && a.MixDatabaseId == getAttrs.Data.Id
                     , _context, _transaction).Data;
             }
@@ -319,12 +319,12 @@ public void LoadData(int? postId = null, int? productId = null, int? pageId = nu
 
         public bool HasValue(string fieldName)
         {
-            return AttributeData != null && AttributeData.Data.Obj.GetValue(fieldName) != null;
+            return AdditionalData != null && AdditionalData.Data.Obj.GetValue(fieldName) != null;
         }
 
         public T Property<T>(string fieldName)
         {
-            return MixCmsHelper.Property<T>(AttributeData?.Data?.Obj, fieldName);
+            return MixCmsHelper.Property<T>(AdditionalData?.Data?.Obj, fieldName);
         }
 
         #endregion Expand

diff --git a/src/Mix.Cms.Lib/ViewModels/MixPages/ReadMvcViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixPages/ReadMvcViewModel.cs
@@ -170,8 +170,8 @@ public string TemplatePath
             }
         }
 
-        [JsonProperty("attributeData")]
-        public MixDatabaseDataAssociations.ReadMvcViewModel AttributeData { get; set; }
+        [JsonProperty("additionalData")]
+        public MixDatabaseDataAssociations.ReadMvcViewModel AdditionalData { get; set; }
 
         [JsonProperty("bodyClass")]
         public string BodyClass => CssClass;
@@ -439,7 +439,7 @@ private void LoadAttributes(MixCmsContext _context, IDbContextTransaction _trans
             var getAttrs = MixDatabases.UpdateViewModel.Repository.GetSingleModel(m => m.Name == MixConstants.MixDatabaseName.ADDITIONAL_COLUMN_PAGE, _context, _transaction);
             if (getAttrs.IsSucceed)
             {
-                AttributeData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
+                AdditionalData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
                 a => a.ParentId == Id.ToString() && a.Specificulture == Specificulture && a.MixDatabaseId == getAttrs.Data.Id
                     , _context, _transaction).Data;
             }
@@ -452,12 +452,12 @@ public MixModules.ReadMvcViewModel GetModule(string name)
 
         public bool HasValue(string fieldName)
         {
-            return AttributeData != null && AttributeData.Data.Obj.GetValue(fieldName) != null;
+            return AdditionalData != null && AdditionalData.Data.Obj.GetValue(fieldName) != null;
         }
 
         public T Property<T>(string fieldName)
         {
-            return MixCmsHelper.Property<T>(AttributeData?.Data?.Obj, fieldName);
+            return MixCmsHelper.Property<T>(AdditionalData?.Data?.Obj, fieldName);
         }
 
         #endregion Expands

diff --git a/src/Mix.Cms.Lib/ViewModels/MixPosts/ImportViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixPosts/ImportViewModel.cs
@@ -120,8 +120,8 @@ public class ImportViewModel
         [JsonProperty("attributes")]
         public MixDatabases.ImportViewModel Attributes { get; set; }
 
-        [JsonProperty("attributeData")]
-        public MixDatabaseDataAssociations.UpdateViewModel AttributeData { get; set; }
+        [JsonProperty("additionalData")]
+        public MixDatabaseDataAssociations.UpdateViewModel AdditionalData { get; set; }
 
         [JsonProperty("sysCategories")]
         public List<MixDatabaseDataAssociations.FormViewModel> SysCategories { get; set; }

diff --git a/src/Mix.Cms.Lib/ViewModels/MixPosts/ReadListItemViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixPosts/ReadListItemViewModel.cs
@@ -101,8 +101,8 @@ public class ReadListItemViewModel
 
         #region Views
 
-        [JsonProperty("attributeData")]
-        public MixDatabaseDataAssociations.ReadMvcViewModel AttributeData { get; set; }
+        [JsonProperty("additionalData")]
+        public MixDatabaseDataAssociations.ReadMvcViewModel AdditionalData { get; set; }
 
         [JsonProperty("sysTags")]
         public List<MixDatabaseDataAssociations.FormViewModel> SysTags { get; set; } = new List<MixDatabaseDataAssociations.FormViewModel>();
@@ -234,7 +234,7 @@ private void LoadAttributes(MixCmsContext _context, IDbContextTransaction _trans
                 m => m.Name == type, _context, _transaction);
             if (getAttrs.IsSucceed)
             {
-                AttributeData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
+                AdditionalData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
                 a => a.ParentId == Id.ToString() && a.Specificulture == Specificulture
                     && a.MixDatabaseId == getAttrs.Data.Id
                     , _context, _transaction).Data;
@@ -266,9 +266,9 @@ private void LoadCategories(MixCmsContext context, IDbContextTransaction transac
         //Get Property by name
         public T Property<T>(string fieldName)
         {
-            if (AttributeData != null)
+            if (AdditionalData != null)
             {
-                var field = AttributeData.Data.Obj?.GetValue(fieldName);
+                var field = AdditionalData.Data.Obj?.GetValue(fieldName);
                 if (field != null)
                 {
                     return field.Value<T>();

diff --git a/src/Mix.Cms.Lib/ViewModels/MixPosts/ReadMvcViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixPosts/ReadMvcViewModel.cs
@@ -173,8 +173,8 @@ public string TemplatePath
         [JsonProperty("Databases")]
         public List<MixDatabases.ReadViewModel> Databases { get; set; } = new List<MixDatabases.ReadViewModel>();
 
-        [JsonProperty("attributeData")]
-        public MixDatabaseDataAssociations.ReadMvcViewModel AttributeData { get; set; }
+        [JsonProperty("additionalData")]
+        public MixDatabaseDataAssociations.ReadMvcViewModel AdditionalData { get; set; }
 
         [JsonProperty("sysTags")]
         public List<MixDatabaseDataAssociations.FormViewModel> SysTags { get; set; } = new List<MixDatabaseDataAssociations.FormViewModel>();
@@ -326,15 +326,15 @@ private void LoadAttributes(MixCmsContext _context, IDbContextTransaction _trans
             var getAttrs = MixDatabases.UpdateViewModel.Repository.GetSingleModel(m => m.Name == Type, _context, _transaction);
             if (getAttrs.IsSucceed)
             {
-                AttributeData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
+                AdditionalData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
                 a => a.ParentId == Id.ToString() && a.Specificulture == Specificulture && a.MixDatabaseId == getAttrs.Data.Id
                     , _context, _transaction).Data ?? new MixDatabaseDataAssociations.ReadMvcViewModel();
             }
         }
 
         public bool HasValue(string fieldName)
         {
-            return AttributeData != null && AttributeData.Data.Obj.GetValue(fieldName) != null;
+            return AdditionalData != null && AdditionalData.Data.Obj.GetValue(fieldName) != null;
         }
 
         /// <summary>Get Post's Property by type and name</summary>
@@ -343,7 +343,7 @@ public bool HasValue(string fieldName)
         /// <returns>T</returns>
         public T Property<T>(string fieldName)
         {
-            return MixCmsHelper.Property<T>(AttributeData?.Data?.Obj, fieldName);
+            return MixCmsHelper.Property<T>(AdditionalData?.Data?.Obj, fieldName);
         }
 
         /// <summary>Gets the module.</summary>

diff --git a/src/Mix.Cms.Lib/ViewModels/MixPosts/ReadViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixPosts/ReadViewModel.cs
@@ -152,8 +152,8 @@ public string ThumbnailUrl
         [JsonProperty("properties")]
         public List<ExtraProperty> Properties { get; set; }
 
-        [JsonProperty("attributeData")]
-        public MixDatabaseDataAssociations.ReadMvcViewModel AttributeData { get; set; }
+        [JsonProperty("additionalData")]
+        public MixDatabaseDataAssociations.ReadMvcViewModel AdditionalData { get; set; }
 
         [JsonProperty("sysTags")]
         public List<MixDatabaseDataAssociations.FormViewModel> SysTags { get; set; } = new List<MixDatabaseDataAssociations.FormViewModel>();
@@ -413,7 +413,7 @@ private void LoadAttributes(MixCmsContext _context, IDbContextTransaction _trans
             var getAttrs = MixDatabases.UpdateViewModel.Repository.GetSingleModel(m => m.Name == MixConstants.MixDatabaseName.ADDITIONAL_COLUMN_POST, _context, _transaction);
             if (getAttrs.IsSucceed)
             {
-                AttributeData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
+                AdditionalData = MixDatabaseDataAssociations.ReadMvcViewModel.Repository.GetFirstModel(
                 a => a.ParentId == Id.ToString() && a.Specificulture == Specificulture && a.MixDatabaseId == getAttrs.Data.Id
                     , _context, _transaction).Data;
             }
@@ -425,9 +425,9 @@ private void LoadAttributes(MixCmsContext _context, IDbContextTransaction _trans
         /// <returns>T</returns>
         public T Property<T>(string fieldName)
         {
-            if (AttributeData != null)
+            if (AdditionalData != null)
             {
-                var field = AttributeData.Data.Obj.GetValue(fieldName);
+                var field = AdditionalData.Data.Obj.GetValue(fieldName);
                 if (field != null)
                 {
                     return field.Value<T>();

diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/css/app-client.min.css b/src/Mix.Cms.Web/wwwroot/mix-app/css/app-client.min.css
diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor-scss.min.css b/src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor-scss.min.css
@@ -1,4 +1,4 @@
-/* Tue Sep 07 2021 10:34:58 GMT+0700 (Indochina Time) */fb-login {
+/* Wed Sep 08 2021 16:56:27 GMT+0700 (Indochina Time) */fb-login {
   background-color: aqua; }
 
 medias .modal {

diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor.min.css b/src/Mix.Cms.Web/wwwroot/mix-app/css/app-vendor.min.css
diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/css/portal.min.css b/src/Mix.Cms.Web/wwwroot/mix-app/css/portal.min.css
diff --git a/src/Mix.Cms.Web/wwwroot/mix-app/css/shared.min.css b/src/Mix.Cms.Web/wwwroot/mix-app/css/shared.min.css