Skip to content

Commit

Permalink
feat(admin/tasks): rename task manager to task admin (#1021)
Browse files Browse the repository at this point in the history
  • Loading branch information
Davidmattei authored Sep 25, 2024
1 parent 1cf2740 commit 373792d
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected function configure(): void
->addOption(self::OPTION_SUBJECT, null, InputOption::VALUE_REQUIRED, 'Set mail subject', 'notification tasks')
->addOption(self::OPTION_DEADLINE_START, null, InputOption::VALUE_REQUIRED, 'Start deadline from now "-1 days"')
->addOption(self::OPTION_DEADLINE_END, null, InputOption::VALUE_REQUIRED, 'End deadline from now "+1 days"')
->addOption(self::OPTION_INCLUDE_TASK_MANAGERS, null, InputOption::VALUE_NONE, 'Include task managers')
->addOption(self::OPTION_INCLUDE_TASK_MANAGERS, null, InputOption::VALUE_NONE, 'Include task admins/managers')
->addOption(self::OPTION_LIMIT, null, InputOption::VALUE_REQUIRED, 'limit the results inside mail', 10)
;
}
Expand Down
2 changes: 1 addition & 1 deletion EMS/core-bundle/src/Core/Revision/Task/TaskMailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ private function getSenderRole(Task $task, UserInterface $sender): ?string
return match (true) {
($sender->getUsername() === $task->getAssignee()) => 'assignee',
($sender->getUsername() === $task->getCreatedBy()) => 'creator',
$this->taskManager->isTaskManager($sender) => 'task manager',
$this->taskManager->isTaskManager($sender) => 'task admin',
default => null,
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ ROLE_SUPER_AUTHOR: 'Super Author'
ROLE_SUPER_PUBLISHER: 'Super Publisher'
ROLE_SUPER_USER: 'Super User'
ROLE_SUPER_WEBMASTER: 'Super Webmaster'
ROLE_TASK_MANAGER: 'Task Manager'
ROLE_TASK_MANAGER: 'Task admin'
ROLE_TRADUCTOR: Traductor
ROLE_COPYWRITER: Copywriter
ROLE_AUDITOR: Auditor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ ROLE_SUPER_AUTHOR: 'Super Author'
ROLE_SUPER_PUBLISHER: 'Super Publisher'
ROLE_SUPER_USER: 'Super User'
ROLE_SUPER_WEBMASTER: 'Super Webmaster'
ROLE_TASK_MANAGER: 'Task Manager'
ROLE_TASK_MANAGER: 'Task admin'
ROLE_COPYWRITER: Copywriter
ROLE_TRADUCTOR: Traductor
ROLE_USER: User
Expand Down
2 changes: 1 addition & 1 deletion docs/elasticms-admin/commands/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ Options:
--subject=SUBJECT Set mail subject [default: "notification tasks"]
--deadline-start=DEADLINE-START Start deadline from now "-1 days"
--deadline-end=DEADLINE-END End deadline from now "+1 days"
--include-task-managers Include task managers
--include-task-managers Include task admins/managers
--limit=LIMIT limit the results inside mail [default: 10]
```
Expand Down
4 changes: 2 additions & 2 deletions docs/elasticms-admin/contentType/contentType.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ When tasks are enabled, every user can create, handle, validate tasks inside a r

If a user completes a task, he can **only** validate the task if he is the requester.

Only the requester and task managers can delete the tasks
Only the requester and task admins can delete the tasks

On all tasks steps the assignee and/or requester will receive **emails**.

Users who have the role `TASK_MANAGER` can see all current tasks in their dashboard overview.

Task manager can also delete tasks, but the requester will receive an email.
Task admins can also delete tasks, but the requester will receive an email.

## Roles

Expand Down
2 changes: 1 addition & 1 deletion docs/elasticms-web/security.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ On submit the application will preform a coreApi login to the environment api.
<li>{{ app.user.displayName }}</li>
<li>{{ app.user.circles|join(' | ') }}</li>
<li>{{ app.user.roles|join(' | ') }}</li>
{% if is_granted('ROLE_TASK_MANAGER') %}<li>Task manager</li>{% endif %}
{% if is_granted('ROLE_TASK_MANAGER') %}<li>Task admin</li>{% endif %}
</ul>
<a href="{{ path("emsch_logout") }}">Logout</a>
{% endif %}
Expand Down

0 comments on commit 373792d

Please sign in to comment.