diff options
| author | crupest <crupest@outlook.com> | 2020-11-22 09:53:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-22 09:53:31 +0800 |
| commit | b3c9cf4bf66bd3b78e94dc522c53e7f7522897f0 (patch) | |
| tree | 996eed1f087a50e8d5cd865e1440f4dbb8a7873b /BackEnd/Timeline | |
| parent | e0785b385138057a23ffd1703a7265c371aef45d (diff) | |
| parent | f1aabc06f1005b26bd1c0c5f36c98c28a62fc31e (diff) | |
| download | timeline-b3c9cf4bf66bd3b78e94dc522c53e7f7522897f0.tar.gz timeline-b3c9cf4bf66bd3b78e94dc522c53e7f7522897f0.tar.bz2 timeline-b3c9cf4bf66bd3b78e94dc522c53e7f7522897f0.zip | |
Merge pull request #189 from crupest/admin
Refactor front end to use the new permission system. Enhance admin page.
Diffstat (limited to 'BackEnd/Timeline')
| -rw-r--r-- | BackEnd/Timeline/Models/Http/UserInfo.cs | 4 | ||||
| -rw-r--r-- | BackEnd/Timeline/Models/User.cs | 2 | ||||
| -rw-r--r-- | BackEnd/Timeline/Services/UserPermissionService.cs | 2 | ||||
| -rw-r--r-- | BackEnd/Timeline/Services/UserService.cs | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/BackEnd/Timeline/Models/Http/UserInfo.cs b/BackEnd/Timeline/Models/Http/UserInfo.cs index 26b04e90..0f865172 100644 --- a/BackEnd/Timeline/Models/Http/UserInfo.cs +++ b/BackEnd/Timeline/Models/Http/UserInfo.cs @@ -25,10 +25,6 @@ namespace Timeline.Models.Http /// Nickname.
/// </summary>
public string Nickname { get; set; } = default!;
- /// <summary>
- /// True if the user is a administrator.
- /// </summary>
- public bool? Administrator { get; set; } = default!;
#pragma warning disable CA2227 // Collection properties should be read only
/// <summary>
/// The permissions of the user.
diff --git a/BackEnd/Timeline/Models/User.cs b/BackEnd/Timeline/Models/User.cs index 1e90cd1d..ae2afe85 100644 --- a/BackEnd/Timeline/Models/User.cs +++ b/BackEnd/Timeline/Models/User.cs @@ -11,8 +11,6 @@ namespace Timeline.Models public string Username { get; set; } = default!;
public string Nickname { get; set; } = default!;
- [Obsolete("Use permissions instead.")]
- public bool Administrator { get; set; }
public UserPermissions Permissions { get; set; } = default!;
public DateTime UsernameChangeTime { get; set; }
diff --git a/BackEnd/Timeline/Services/UserPermissionService.cs b/BackEnd/Timeline/Services/UserPermissionService.cs index 42c93283..9683000a 100644 --- a/BackEnd/Timeline/Services/UserPermissionService.cs +++ b/BackEnd/Timeline/Services/UserPermissionService.cs @@ -22,7 +22,7 @@ namespace Timeline.Services /// <summary>
/// This permission allow to add or remove highlight timelines.
/// </summary>
- HighlightTimelineManangement
+ HighlightTimelineManagement
}
/// <summary>
diff --git a/BackEnd/Timeline/Services/UserService.cs b/BackEnd/Timeline/Services/UserService.cs index f83d2928..2c5644cd 100644 --- a/BackEnd/Timeline/Services/UserService.cs +++ b/BackEnd/Timeline/Services/UserService.cs @@ -157,7 +157,6 @@ namespace Timeline.Services {
UniqueId = entity.UniqueId,
Username = entity.Username,
- Administrator = permission.Contains(UserPermission.UserManagement),
Permissions = permission,
Nickname = string.IsNullOrEmpty(entity.Nickname) ? entity.Username : entity.Nickname,
Id = entity.Id,
|