diff options
| author | Danail Dimitrov <danaildimitrov321@gmail.com> | 2021-01-26 15:50:16 +0200 |
|---|---|---|
| committer | Danail Dimitrov <danaildimitrov321@gmail.com> | 2021-01-26 15:50:16 +0200 |
| commit | acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0 (patch) | |
| tree | 38c290bd7bad75edfdeb9631948ef654c3a282f0 /src/DevHive.Web/Models/Identity | |
| parent | f61da9c07ff37cb350528e255539b4ec11181bde (diff) | |
| parent | bddc0b0566bc19e936ccae9d3aa16b6e0116b186 (diff) | |
| download | DevHive-acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0.tar DevHive-acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0.tar.gz DevHive-acf0e2f3908ba45dca1ff04cc1e5a892cc2cdbf0.zip | |
Merge branch 'dev' of https://github.com/Team-Kaleidoscope/DevHive into dev
Diffstat (limited to 'src/DevHive.Web/Models/Identity')
| -rw-r--r-- | src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs | 6 | ||||
| -rw-r--r-- | src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs | 2 | ||||
| -rw-r--r-- | src/DevHive.Web/Models/Identity/User/UserWebModel.cs | 2 | ||||
| -rw-r--r-- | src/DevHive.Web/Models/Identity/User/UsernameWebModel.cs (renamed from src/DevHive.Web/Models/Identity/User/FriendWebModel.cs) | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs b/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs index 254affc..3870481 100644 --- a/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs +++ b/src/DevHive.Web/Models/Identity/Role/UpdateRoleWebModel.cs @@ -4,10 +4,12 @@ using System.Diagnostics.CodeAnalysis; namespace DevHive.Web.Models.Identity.Role { - public class UpdateRoleWebModel : RoleWebModel + public class UpdateRoleWebModel { [NotNull] [Required] - public Guid Id { get; set; } + [MinLength(3)] + [MaxLength(50)] + public string Name { get; set; } } } diff --git a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs index 30c66fb..62901f6 100644 --- a/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs +++ b/src/DevHive.Web/Models/Identity/User/UpdateUserWebModel.cs @@ -17,7 +17,7 @@ namespace DevHive.Web.Models.Identity.User [NotNull] [Required] - public HashSet<FriendWebModel> Friends { get; set; } + public HashSet<UsernameWebModel> Friends { get; set; } [NotNull] [Required] diff --git a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs index 5b80ba3..4097901 100644 --- a/src/DevHive.Web/Models/Identity/User/UserWebModel.cs +++ b/src/DevHive.Web/Models/Identity/User/UserWebModel.cs @@ -15,7 +15,7 @@ namespace DevHive.Web.Models.Identity.User [NotNull] [Required] - public HashSet<FriendWebModel> Friends { get; set; } = new HashSet<FriendWebModel>(); + public HashSet<UsernameWebModel> Friends { get; set; } = new HashSet<UsernameWebModel>(); [NotNull] [Required] diff --git a/src/DevHive.Web/Models/Identity/User/FriendWebModel.cs b/src/DevHive.Web/Models/Identity/User/UsernameWebModel.cs index d59bff5..a20c1bf 100644 --- a/src/DevHive.Web/Models/Identity/User/FriendWebModel.cs +++ b/src/DevHive.Web/Models/Identity/User/UsernameWebModel.cs @@ -4,7 +4,7 @@ using DevHive.Web.Attributes; namespace DevHive.Web.Models.Identity.User { - public class FriendWebModel + public class UsernameWebModel { [NotNull] [Required] |