Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 21:34:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix error when removing permission without scope from group

Browse Source
This commit is contained in:
Julien Fastré 2018-09-05 11:06:33 +02:00
parent e88265adcd
commit 0a0854d4cf
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Controller/PermissionsGroupController.php
View File

@ -365,13 +365,20 @@ class PermissionsGroupController extends Controller
$em->flush(); $em->flush();
$this->addFlash('notice', if ($roleScope->getScope() !== NULL ) {
$this->addFlash('notice',
$this->get('translator')->trans("The role '%role%' on circle " $this->get('translator')->trans("The role '%role%' on circle "
. "'%scope%' has been removed", array( . "'%scope%' has been removed", array(
'%role%' => $this->get('translator')->trans($roleScope->getRole()), '%role%' => $this->get('translator')->trans($roleScope->getRole()),
'%scope%' => $this->get('chill.main.helper.translatable_string') '%scope%' => $this->get('chill.main.helper.translatable_string')
->localize($roleScope->getScope()->getName()) ->localize($roleScope->getScope()->getName())
))); )));
} else {
$this->addFlash('notice',
$this->get('translator')->trans("The role '%role%' has been removed", array(
'%role%' => $this->get('translator')->trans($roleScope->getRole())
)));
}
return $this->redirect($this->generateUrl('admin_permissionsgroup_edit', return $this->redirect($this->generateUrl('admin_permissionsgroup_edit',
array('id' => $pgid))); array('id' => $pgid)));

2
Resources/translations/messages.fr.yml
View File

@ -102,6 +102,8 @@ Role: Rôle
Choose amongst roles: Choisir parmi les rôles Choose amongst roles: Choisir parmi les rôles
Add permission: Ajouter les permissions Add permission: Ajouter les permissions
This group does not provide any permission: Ce groupe n'attribue aucune permission This group does not provide any permission: Ce groupe n'attribue aucune permission
The role '%role%' has been removed: Le rôle "%role%" a été enlevé de ce groupe de permission
The role '%role%' on circle '%scope%' has been removed: Le rôle "%role%" sur le cercle "%scope%" a été enlevé de ce groupe de permission
#admin section for users #admin section for users
List users: Liste des utilisateurs List users: Liste des utilisateurs