From deee704135a390f6678532fe9f79820a9db21a94 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 5 Sep 2018 23:13:07 +0000 Subject: [PATCH] --- server/AyaNova/models/User.cs | 2 ++ server/AyaNova/models/UserOptions.cs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/server/AyaNova/models/User.cs b/server/AyaNova/models/User.cs index cb5c1edf..e9f14ccb 100644 --- a/server/AyaNova/models/User.cs +++ b/server/AyaNova/models/User.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using AyaNova.Biz; using System.ComponentModel.DataAnnotations; +using Newtonsoft.Json; namespace AyaNova.Models { @@ -39,6 +40,7 @@ namespace AyaNova.Models //relations //https://docs.microsoft.com/en-us/ef/core/modeling/relationships#other-relationship-patterns + [JsonIgnore] public UserOptions UserOptions { get; set; } } diff --git a/server/AyaNova/models/UserOptions.cs b/server/AyaNova/models/UserOptions.cs index 7c5342a2..8ab67429 100644 --- a/server/AyaNova/models/UserOptions.cs +++ b/server/AyaNova/models/UserOptions.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using AyaNova.Biz; using System.ComponentModel.DataAnnotations; +using Newtonsoft.Json; namespace AyaNova.Models { @@ -19,6 +20,7 @@ namespace AyaNova.Models //relations //https://docs.microsoft.com/en-us/ef/core/modeling/relationships#other-relationship-patterns + [JsonIgnore] public User User { get; set; } [Required] public long UserId { get; set; }//will be auto-set by EF due to relationship defined @@ -26,7 +28,7 @@ namespace AyaNova.Models public UserOptions(long ownerId) { - + TimeZoneOffset = 0; UiColor = 0; OwnerId = ownerId;