mixcore · nhathoang989 · Sep 27, 2021 · Sep 27, 2021
diff --git a/src/Mix.Cms.Lib/Models/Common/MenuItem.cs b/src/Mix.Cms.Lib/Models/Common/MenuItem.cs
@@ -9,7 +9,6 @@ namespace Mix.Cms.Lib.Models.Common
 {
     public class MenuItem
     {
-        [JsonIgnore]
         [JsonProperty("obj")]
         public JObject Obj { get; set; }
 
@@ -63,15 +62,7 @@ public T Property<T>(string fieldName)
         {
             if (Obj != null)
             {
-                var field = Obj.GetValue(fieldName);
-                if (field != null)
-                {
-                    return field.Value<T>();
-                }
-                else
-                {
-                    return default;
-                }
+                return Obj.Value<T>(fieldName);
             }
             else
             {

diff --git a/src/Mix.Cms.Lib/Models/Common/MixNavigation.cs b/src/Mix.Cms.Lib/Models/Common/MixNavigation.cs
@@ -27,18 +27,40 @@ public class MixNavigation
         [JsonProperty("actived_menu_item")]
         public MenuItem ActivedMenuItem { get; set; }
 
+        [JsonProperty("obj")]
+        public JObject Obj { get; set; }
+
         public MixNavigation()
         {
         }
 
         public MixNavigation(JObject obj, string culture)
         {
+            Obj = obj;
             Id = obj["id"].Value<string>();
             Specificulture = culture;
             Title = obj["title"].Value<string>();
             Name = obj["name"].Value<string>();
-            MenuItems = obj["menu_items"].ToObject<List<MenuItem>>();
-            MenuItems.ForEach(m => m.Specificulture = Specificulture);
+            var arr = obj["menu_items"].ToObject<JArray>();
+            foreach (JObject item in arr)
+            {
+                var menuItem = item.ToObject<MenuItem>();
+                menuItem.Obj = item;
+                menuItem.Specificulture = Specificulture;
+                MenuItems.Add(menuItem);
+            }
+        }
+
+        public T Property<T>(string fieldName)
+        {
+            if (Obj != null)
+            {
+                return Obj.Value<T>(fieldName);
+            }
+            else
+            {
+                return default;
+            }
         }
     }
 }
diff --git a/src/Mix.Cms.Lib/ViewModels/MixDatabaseDatas/FormViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixDatabaseDatas/FormViewModel.cs
@@ -476,7 +476,11 @@ private async Task<RepositoryResponse<bool>> SaveRefDataAsync(MixDatabaseData pa
                     else
                     {
                         var getRelated = await MixDatabaseDataAssociations.UpdateViewModel.Repository.GetSingleModelAsync(
-                                m => m.DataId == item.Id && m.Specificulture == item.Specificulture, context, transaction);
+                                m => 
+                                    m.DataId == item.Id 
+                                    && m.ParentId == Id 
+                                    && m.Specificulture == item.Specificulture,
+                                    context, transaction);
                         if (getRelated.IsSucceed)
                         {
                             RelatedData.Add(getRelated.Data);

diff --git a/src/Mix.Cms.Lib/ViewModels/MixDatabaseDatas/NavigationViewModel.cs b/src/Mix.Cms.Lib/ViewModels/MixDatabaseDatas/NavigationViewModel.cs
@@ -73,7 +73,7 @@ public MixNavigation Nav
             {
                 if (MixDatabaseName == MixConstants.MixDatabaseName.NAVIGATION && Obj != null)
                 {
-                    return Obj.ToObject<MixNavigation>();
+                    return new MixNavigation(Obj, Specificulture);
                 }
                 return null;
             }

diff --git a/src/Mix.Cms.Web/MixContent/voido-coffee.db-shm b/src/Mix.Cms.Web/MixContent/voido-coffee.db-shm
diff --git a/src/Mix.Cms.Web/MixContent/voido-coffee.db-wal b/src/Mix.Cms.Web/MixContent/voido-coffee.db-wal
diff --git a/src/Mix.Heart.NetCore/Mix.Heart.NetCore.csproj b/src/Mix.Heart.NetCore/Mix.Heart.NetCore.csproj
@@ -6,7 +6,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Mix.Heart" Version="1.0.4.1" />
+    <!--<PackageReference Include="Mix.Heart" Version="1.0.4.1" />-->
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\mix.heart\src\Mix.Heart\Mix.Heart.csproj" />
   </ItemGroup>
 
 </Project>