Merge branch 'master' into remove-cos

3 files changed, 7 insertions, 7 deletions

diff --git a/Timeline/Entities/Http/User.cs b/Timeline/Entities/Http/User.cs
index 91423c7b..b5384778 100644
--- a/Timeline/Entities/Http/User.cs
+++ b/Timeline/Entities/Http/User.cs
@@ -3,13 +3,13 @@
     public class UserPutRequest
     {
         public string Password { get; set; }
-        public bool IsAdmin { get; set; }
+        public bool Administrator { get; set; }
     }
 
     public class UserPatchRequest
     {
         public string Password { get; set; }
-        public bool? IsAdmin { get; set; }
+        public bool? Administrator { get; set; }
     }
 
     public class ChangePasswordRequest
diff --git a/Timeline/Entities/UserInfo.cs b/Timeline/Entities/UserInfo.cs
index 9a82c991..414a8dfe 100644
--- a/Timeline/Entities/UserInfo.cs
+++ b/Timeline/Entities/UserInfo.cs
@@ -6,18 +6,18 @@ namespace Timeline.Entities
         {
         }
 
-        public UserInfo(string username, bool isAdmin)
+        public UserInfo(string username, bool administrator)
         {
             Username = username;
-            IsAdmin = isAdmin;
+            Administrator = administrator;
         }
 
         public string Username { get; set; }
-        public bool IsAdmin { get; set; }
+        public bool Administrator { get; set; }
 
         public override string ToString()
         {
-            return $"Username: {Username} ; IsAdmin: {IsAdmin}";
+            return $"Username: {Username} ; Administrator: {Administrator}";
         }
     }
 }
diff --git a/Timeline/Entities/UserUtility.cs b/Timeline/Entities/UserUtility.cs
index cbbd391c..14cdb2d6 100644
--- a/Timeline/Entities/UserUtility.cs
+++ b/Timeline/Entities/UserUtility.cs
@@ -54,7 +54,7 @@ namespace Timeline.Entities
         {
             if (user == null)
                 throw new ArgumentNullException(nameof(user));
-            return new UserCache { Username = user.Name, IsAdmin = RoleStringToIsAdmin(user.RoleString), Version = user.Version };
+            return new UserCache { Username = user.Name, Administrator = RoleStringToIsAdmin(user.RoleString), Version = user.Version };
         }
     }
 }