From 6c3e2e94dc493cba9c42bf9c97ebf1ce4a36f25b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janis=20Daniel=20Da=CC=88hne?=
<janis.daehne2@student.uni-halle.de>
Date: Sat, 29 Jun 2019 16:02:45 +0200
Subject: [PATCH] - fixed issue where manage exercise release was not properly
renamed everywhere
---
.../Exercises/ExerciseOverviewController.cs | 4 ++--
.../Controllers/Core/Users/GroupController.cs | 6 +++---
.../Core/Users/GroupRolesController.cs | 18 +++++++++---------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/ClientServer/Controllers/Core/Exercises/ExerciseOverviewController.cs b/src/ClientServer/Controllers/Core/Exercises/ExerciseOverviewController.cs
index 253993b..42f4549 100644
--- a/src/ClientServer/Controllers/Core/Exercises/ExerciseOverviewController.cs
+++ b/src/ClientServer/Controllers/Core/Exercises/ExerciseOverviewController.cs
@@ -605,7 +605,7 @@ namespace ClientServer.Controllers.Core.Exercises
canChangeExercises: p.GroupRole.GroupRolePermission.CanChangeExercises,
canCreateExercises: p.GroupRole.GroupRolePermission.CanCreateExercises,
canAssessExercises: p.GroupRole.GroupRolePermission.CanAssessExercises,
- canReleaseExercises: p.GroupRole.GroupRolePermission.CanManageExerciseReleases,
+ canManageExerciseReleases: p.GroupRole.GroupRolePermission.CanManageExerciseReleases,
canDeleteExercises: p.GroupRole.GroupRolePermission.CanDeleteExercises,
canAddUserToGroup: p.GroupRole.GroupRolePermission.CanAddUserToGroup,
canLockExercisesPermanently: p.GroupRole.GroupRolePermission.CanLockExercisesPermanently,
@@ -1144,7 +1144,7 @@ namespace ClientServer.Controllers.Core.Exercises
canCreateExercises: managingGroupConnection.GroupRole.GroupRolePermission.CanCreateExercises,
canAssessExercises: managingGroupConnection.GroupRole.GroupRolePermission.CanAssessExercises,
canDeleteExercises: managingGroupConnection.GroupRole.GroupRolePermission.CanDeleteExercises,
- canReleaseExercises: managingGroupConnection.GroupRole.GroupRolePermission.CanManageExerciseReleases,
+ canManageExerciseReleases: managingGroupConnection.GroupRole.GroupRolePermission.CanManageExerciseReleases,
canAddUserToGroup: managingGroupConnection.GroupRole.GroupRolePermission.CanAddUserToGroup,
canLockExercisesPermanently: managingGroupConnection.GroupRole.GroupRolePermission
.CanLockExercisesPermanently,
diff --git a/src/ClientServer/Controllers/Core/Users/GroupController.cs b/src/ClientServer/Controllers/Core/Users/GroupController.cs
index 4db167e..f58fab2 100644
--- a/src/ClientServer/Controllers/Core/Users/GroupController.cs
+++ b/src/ClientServer/Controllers/Core/Users/GroupController.cs
@@ -321,7 +321,7 @@ namespace ClientServer.Controllers.Core.Users
canChangeExercises: userWithUserGroup.GroupRole.GroupRolePermission.CanChangeExercises,
canCreateExercises: userWithUserGroup.GroupRole.GroupRolePermission.CanCreateExercises,
canAssessExercises: userWithUserGroup.GroupRole.GroupRolePermission.CanAssessExercises,
- canReleaseExercises: userWithUserGroup.GroupRole.GroupRolePermission.CanManageExerciseReleases,
+ canManageExerciseReleases: userWithUserGroup.GroupRole.GroupRolePermission.CanManageExerciseReleases,
canDeleteExercises: userWithUserGroup.GroupRole.GroupRolePermission.CanDeleteExercises,
canAddUserToGroup: userWithUserGroup.GroupRole.GroupRolePermission.CanAddUserToGroup,
canLockExercisesPermanently: userWithUserGroup.GroupRole.GroupRolePermission.CanLockExercisesPermanently,
@@ -393,7 +393,7 @@ namespace ClientServer.Controllers.Core.Users
canChangeExercises: connection.GroupRole.GroupRolePermission.CanChangeExercises,
canCreateExercises: connection.GroupRole.GroupRolePermission.CanCreateExercises,
canAssessExercises: connection.GroupRole.GroupRolePermission.CanAssessExercises,
- canReleaseExercises: connection.GroupRole.GroupRolePermission.CanManageExerciseReleases,
+ canManageExerciseReleases: connection.GroupRole.GroupRolePermission.CanManageExerciseReleases,
canDeleteExercises: connection.GroupRole.GroupRolePermission.CanDeleteExercises,
canAddUserToGroup: connection.GroupRole.GroupRolePermission.CanAddUserToGroup,
canLockExercisesPermanently: connection.GroupRole.GroupRolePermission.CanLockExercisesPermanently,
@@ -987,7 +987,7 @@ namespace ClientServer.Controllers.Core.Users
canChangeExercises: groupRole.GroupRolePermission.CanChangeExercises,
canDeleteExercises: groupRole.GroupRolePermission.CanDeleteExercises,
canLockExercisesPermanently: connection.GroupRole.GroupRolePermission.CanLockExercisesPermanently,
- canReleaseExercises: groupRole.GroupRolePermission.CanManageExerciseReleases,
+ canManageExerciseReleases: groupRole.GroupRolePermission.CanManageExerciseReleases,
canRemoveMemberFromGroup: groupRole.GroupRolePermission.CanRemoveMemberFromGroup,
canSeeExercisesFromOthersInGroup: groupRole.GroupRolePermission.CanSeeExercisesFromOthersInGroup,
canSeeOtherMembers: connection.GroupRole.GroupRolePermission.CanSeeOtherMembers,
diff --git a/src/ClientServer/Controllers/Core/Users/GroupRolesController.cs b/src/ClientServer/Controllers/Core/Users/GroupRolesController.cs
index 504098d..f4a570f 100644
--- a/src/ClientServer/Controllers/Core/Users/GroupRolesController.cs
+++ b/src/ClientServer/Controllers/Core/Users/GroupRolesController.cs
@@ -76,7 +76,7 @@ namespace ClientServer.Controllers.Core.Users
canChangeExercises: groupRole.GroupRolePermission.CanChangeExercises,
canDeleteExercises: groupRole.GroupRolePermission.CanDeleteExercises,
canLockExercisesPermanently: groupRole.GroupRolePermission.CanLockExercisesPermanently,
- canReleaseExercises: groupRole.GroupRolePermission.CanManageExerciseReleases,
+ canManageExerciseReleases: groupRole.GroupRolePermission.CanManageExerciseReleases,
canRemoveMemberFromGroup: groupRole.GroupRolePermission.CanRemoveMemberFromGroup,
canSeeExercisesFromOthersInGroup: groupRole.GroupRolePermission.CanSeeExercisesFromOthersInGroup,
canSeeOtherMembers: groupRole.GroupRolePermission.CanSeeOtherMembers,
@@ -146,7 +146,7 @@ namespace ClientServer.Controllers.Core.Users
canChangeExercises: groupRole.GroupRolePermission.CanChangeExercises,
canDeleteExercises: groupRole.GroupRolePermission.CanDeleteExercises,
canLockExercisesPermanently: groupRole.GroupRolePermission.CanLockExercisesPermanently,
- canReleaseExercises: groupRole.GroupRolePermission.CanManageExerciseReleases,
+ canManageExerciseReleases: groupRole.GroupRolePermission.CanManageExerciseReleases,
canRemoveMemberFromGroup: groupRole.GroupRolePermission.CanRemoveMemberFromGroup,
canSeeExercisesFromOthersInGroup: groupRole.GroupRolePermission.CanSeeExercisesFromOthersInGroup,
canSeeOtherMembers: groupRole.GroupRolePermission.CanSeeOtherMembers,
@@ -194,7 +194,7 @@ namespace ClientServer.Controllers.Core.Users
CanSeeExercisesFromOthersInGroup: role.CanSeeExercisesFromOthersInGroup,
CanRemoveMemberFromGroup: role.CanRemoveMemberFromGroup,
CanChangeExercises: role.CanChangeExercises,
- canManageExerciseReleases: role.CanReleaseExercises,
+ canManageExerciseReleases: role.CanManageExerciseReleases,
CanSeeOtherMembers: role.CanSeeExercisesFromOthersInGroup,
CanChangeGroupData: role.CanChangeGroupData
)
@@ -220,7 +220,7 @@ namespace ClientServer.Controllers.Core.Users
canChangeExercises: newRole.GroupRolePermission.CanChangeExercises,
canCreateExercises: newRole.GroupRolePermission.CanCreateExercises,
canRemoveMemberFromGroup: newRole.GroupRolePermission.CanRemoveMemberFromGroup,
- canReleaseExercises: newRole.GroupRolePermission.CanManageExerciseReleases,
+ canManageExerciseReleases: newRole.GroupRolePermission.CanManageExerciseReleases,
canAddUserToGroup: newRole.GroupRolePermission.CanAddUserToGroup,
canDeleteExercises: newRole.GroupRolePermission.CanDeleteExercises,
canLockExercisesPermanently: newRole.GroupRolePermission.CanLockExercisesPermanently,
@@ -279,7 +279,7 @@ namespace ClientServer.Controllers.Core.Users
oldRole.GroupRolePermission.CanSeeExercisesFromOthersInGroup = role.CanSeeExercisesFromOthersInGroup;
oldRole.GroupRolePermission.CanRemoveMemberFromGroup = role.CanRemoveMemberFromGroup;
oldRole.GroupRolePermission.CanChangeExercises = role.CanChangeExercises;
- oldRole.GroupRolePermission.CanManageExerciseReleases = role.CanReleaseExercises;
+ oldRole.GroupRolePermission.CanManageExerciseReleases = role.CanManageExerciseReleases;
oldRole.GroupRolePermission.CanSeeOtherMembers = role.CanSeeOtherMembers;
oldRole.GroupRolePermission.CanChangeGroupData = role.CanChangeGroupData;
@@ -301,7 +301,7 @@ namespace ClientServer.Controllers.Core.Users
canChangeExercises: oldRole.GroupRolePermission.CanChangeExercises,
canCreateExercises: oldRole.GroupRolePermission.CanCreateExercises,
canRemoveMemberFromGroup: oldRole.GroupRolePermission.CanRemoveMemberFromGroup,
- canReleaseExercises: oldRole.GroupRolePermission.CanManageExerciseReleases,
+ canManageExerciseReleases: oldRole.GroupRolePermission.CanManageExerciseReleases,
canAddUserToGroup: oldRole.GroupRolePermission.CanAddUserToGroup,
canDeleteExercises: oldRole.GroupRolePermission.CanDeleteExercises,
canLockExercisesPermanently: oldRole.GroupRolePermission.CanLockExercisesPermanently,
@@ -424,7 +424,7 @@ namespace ClientServer.Controllers.Core.Users
public GroupRoleWithPermissionFullBase(int id, string displayName, bool canCreateExercises,
bool canChangeExercises, bool canDeleteExercises, bool canLockExercisesPermanently, bool canSeeExercisesFromOthersInGroup,
- bool canReleaseExercises, bool canAssessExercises, bool canAddUserToGroup,
+ bool canManageExerciseReleases, bool canAssessExercises, bool canAddUserToGroup,
bool canRemoveMemberFromGroup, bool canChangeOtherMembersRole, bool canSeeOtherMembers,
bool canChangeGroupData)
{
@@ -435,7 +435,7 @@ namespace ClientServer.Controllers.Core.Users
this.CanDeleteExercises = canDeleteExercises;
this.CanLockExercisesPermanently = canLockExercisesPermanently;
this.CanSeeExercisesFromOthersInGroup = canSeeExercisesFromOthersInGroup;
- this.CanReleaseExercises = canReleaseExercises;
+ this.CanManageExerciseReleases = canManageExerciseReleases;
this.CanAssessExercises = canAssessExercises;
this.CanAddUserToGroup = canAddUserToGroup;
this.CanRemoveMemberFromGroup = canRemoveMemberFromGroup;
@@ -470,7 +470,7 @@ namespace ClientServer.Controllers.Core.Users
/// <summary>
/// true: can release exercises, false: not
/// </summary>
- public bool CanReleaseExercises { get; set; }
+ public bool CanManageExerciseReleases { get; set; }
/// <summary>
/// true: can copy exercises, false: not
--
GitLab