few more small fixes

complete join button on webfront update for 2.2.6.0
2019-04-08 12:29:48 -05:00
parent dd82a5e3fa
commit 9d9be7f8af
12 changed files with 113 additions and 23 deletions
--- a/SharedLibraryCore/Database/Models/EFClient.cs
+++ b/SharedLibraryCore/Database/Models/EFClient.cs
@ -40,8 +40,8 @@ namespace SharedLibraryCore.Database.Models
        [NotMapped]
        public virtual string Name
        {
-            get { return CurrentAlias.Name; }
-            set { CurrentAlias.Name = value; }
+            get { return CurrentAlias?.Name ?? "--"; }
+            set { if (CurrentAlias != null) CurrentAlias.Name = value; }
        }
        [NotMapped]
        public virtual int? IPAddress