Skip to content
Draft
Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions Resources/roles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@ manager:
- admin-module-stats # Can access to stats
level: 50

channelconsultant:
extends: checker # inherits permissions from role "user"
perms:
- edit-projects # Edit projects assigned as a consultant
- edit-published-projects # Edit any published project
- assign-checker # Assignate any other user for review projects
- admin-module-channel-resource # Can access to channel resource admin module
- full-html-edit # Affects if the user is allowed dangerous tags (iframe,...) in posts
level: 60

consultant:
extends: checker # inherits permissions from role "user"
perms:
Expand Down
7 changes: 5 additions & 2 deletions src/Goteo/Library/Forms/Model/ProjectCampaignForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ public function createForm(): ProjectCampaignForm

$builder = $this->getBuilder();
$admin = Session::isAdmin();
if ($admin) {
$user = Session::getUser();
$canUserEdit = $user->hasPerm('edit-projects', $project->id);

if ($admin || $canUserEdit) {
$builder
->add('type', ChoiceType::class, [
'label' => 'project-campaign-type-label',
Expand Down Expand Up @@ -72,7 +75,7 @@ public function createForm(): ProjectCampaignForm
]);
}

if ($admin || $project->type != Conf::TYPE_PERMANENT ) {
if ($admin || $canUserEdit || $project->type != Conf::TYPE_PERMANENT ) {
$builder
->add('one_round', ChoiceType::class, [
'disabled' => $this->getReadonly(),
Expand Down
1 change: 1 addition & 0 deletions translations/ca/roles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ role-name-stats: 'Accés a stats'
role-name-manager: 'Gestor de contractes'
role-name-helper: 'Ajudant'
role-name-consultant: 'Assessor de projectes'
role-name-channelconsultat: 'Assessor de canals'
role-name-admin: 'Administrador d''assessors'
role-name-superadmin: 'Super-Administrador'
role-perm-name-create-project: 'Pot crear projectes'
Expand Down
3 changes: 2 additions & 1 deletion translations/en/roles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ role-name-manager: 'Contract manager'
role-name-blogger: 'Blog editor'
role-name-caller: 'Call owner'
role-name-consultant: 'Project''s consultant'
role-name-channelconsultant: 'Channel''s consultant'
role-name-admin: 'Consultant''s administrator'
role-name-superadmin: 'Super-Administrator'
role-name-owner: 'Project owner'
Expand Down Expand Up @@ -61,4 +62,4 @@ role-perm-name-create-matcher: 'Create own matcher'
role-perm-name-edit-matcher: 'Edit own matcher'
role-perm-name-remove-matcher: 'Remove own matcher'
role-perm-name-edit-any-matcher: 'Edit any matcher'
role-perm-name-remove-any-matcher: 'Remove any matcher'
role-perm-name-remove-any-matcher: 'Remove any matcher'
1 change: 1 addition & 0 deletions translations/es/roles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ role-name-manager: 'Gestor de contratos'
role-name-blogger: 'Editor del blog'
role-name-caller: 'Convocador'
role-name-consultant: 'Asesor de proyectos'
role-name-channelconsultat: 'Asesor de canales'
role-name-admin: 'Administrador de asesores'
role-name-superadmin: 'Super Administrador'
role-name-owner: 'Impulsor'
Expand Down