diff --git a/app/V1Module/presenters/RegistrationPresenter.php b/app/V1Module/presenters/RegistrationPresenter.php index ff51ad28..a8753a3b 100644 --- a/app/V1Module/presenters/RegistrationPresenter.php +++ b/app/V1Module/presenters/RegistrationPresenter.php @@ -33,7 +33,6 @@ */ class RegistrationPresenter extends BasePresenter { - /** * @var Logins * @inject diff --git a/app/config/permissions.neon b/app/config/permissions.neon index 0e16b422..50e67de0 100644 --- a/app/config/permissions.neon +++ b/app/config/permissions.neon @@ -166,9 +166,8 @@ permissions: - allow: true resource: group - role: supervisor + role: supervisor-student actions: - - addStudent # requires permissions to read all users' private data - inviteStudents # create future invitations, that the students can use to join - editInvitations # add, update, and remove invitation links (for already registered users) - removeStudent @@ -176,6 +175,15 @@ permissions: - group.isSupervisor - group.isNotArchived + - allow: true + resource: group + role: supervisor + actions: + - addStudent # requires permissions to read all users' private data + conditions: + - group.isSupervisor + - group.isNotArchived + - allow: true resource: group role: supervisor-student @@ -327,13 +335,18 @@ permissions: - listPendingReviews conditions: user.isSameUser + - allow: true + role: supervisor-student + resource: user + actions: + - inviteForRegistration + - allow: true role: supervisor resource: user actions: - viewDetail - viewAll - - inviteForRegistration ########################## # Assignment permissions # diff --git a/app/model/view/UserViewFactory.php b/app/model/view/UserViewFactory.php index 274d28fe..874640b0 100644 --- a/app/model/view/UserViewFactory.php +++ b/app/model/view/UserViewFactory.php @@ -14,7 +14,6 @@ */ class UserViewFactory { - /** * @var IUserPermissions */ diff --git a/recodex-api.spec b/recodex-api.spec index 5fc37782..b40131e4 100644 --- a/recodex-api.spec +++ b/recodex-api.spec @@ -2,8 +2,8 @@ %define short_name api %define install_dir /opt/%{name} %define version 2.9.0 -%define unmangled_version c23ec53358e1f91fe7f29185cd3336b742634fe3 -%define release 1 +%define unmangled_version c7f2542373bb26f0ecccf8b776514419801e2e77 +%define release 2 Summary: ReCodEx core API component Name: %{name}