Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ProcessMaker/Http/Controllers/Api/PermissionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ public function update(Request $request)
//Obtain the requested user or group
if ($request->input('user_id')) {
$entity = User::findOrFail($request->input('user_id'));
//Obtain user old Permissions before save
$entity->memberships = $entity->groupMembersFromMemberable()->get();
// Obtain user old Permissions before save
$originalPermissionNames = $entity->permissions()->pluck('name')->toArray();

if ($request->has('is_administrator')) {
Expand All @@ -97,14 +96,20 @@ public function update(Request $request)
$originalPermissionNames = $entity->permissions()->pluck('name')->toArray();
}

//Obtain the requested permission names for that entity
// Obtain the requested permission names for that entity
$requestPermissions = $request->input('permission_names');

//Convert permission names into a collection of Permission models
// Convert permission names into a collection of Permission models
$permissions = Permission::whereIn('name', $requestPermissions)->get();

// Call Event to store Permissions Changes in Log
PermissionUpdated::dispatch($requestPermissions, $originalPermissionNames, $entity->is_administrator ?: false, $request->input('user_id'), $request->input('group_id'));
PermissionUpdated::dispatch(
$requestPermissions,
$originalPermissionNames,
$entity->is_administrator ?: false,
$request->input('user_id'),
$request->input('group_id')
);

//Sync the entity's permissions with the database
$entity->permissions()->sync($permissions->pluck('id')->toArray());
Expand Down