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
19 changes: 18 additions & 1 deletion ProcessMaker/Events/PermissionUpdated.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Foundation\Events\Dispatchable;
use ProcessMaker\Contracts\SecurityLogEventInterface;
use ProcessMaker\Helpers\ArrayHelper;
use ProcessMaker\Models\User;
use ProcessMaker\Traits\FormatSecurityLogChanges;

Expand All @@ -20,6 +21,8 @@ class PermissionUpdated implements SecurityLogEventInterface

private string $userId;

private array $arrayPermissions = [];

/**
* Create a new event instance.
*
Expand All @@ -35,6 +38,11 @@ public function __construct(
$this->originalPermissions = $originalPermissions;
$this->permissionType = $permissionType;
$this->userId = $userId;

$this->arrayPermissions = ArrayHelper::getArrayDifferencesWithFormat(
$this->changedPermissions,
$this->originalPermissions
);
}

/**
Expand All @@ -55,12 +63,21 @@ public function getData(): array
'+ permission_names' => 'Super Admin - All Permissions',
];
} else {
foreach ($this->arrayPermissions as $key => $value) {
$this->arrayPermissions = ArrayHelper::replaceKeyInArray(
$this->arrayPermissions,
$key,
substr($key, 0, 1) . ' Permission' . substr($key, 2)
);
}

return array_merge([
'name' => [
'label' => $userData->getAttribute('username'),
'link' => route('users.edit', $this->userId) . '#nav-profile',
],
], $this->formatChanges($this->changedPermissions, $this->originalPermissions));
'last_modified' => $userData->getAttribute('updated_at')
], $this->arrayPermissions);
}
}

Expand Down