diff --git a/Controller/PermissionsGroupController.php b/Controller/PermissionsGroupController.php index 336cab5d5..4c828c6aa 100644 --- a/Controller/PermissionsGroupController.php +++ b/Controller/PermissionsGroupController.php @@ -365,13 +365,20 @@ class PermissionsGroupController extends Controller $em->flush(); - $this->addFlash('notice', + if ($roleScope->getScope() !== NULL ) { + $this->addFlash('notice', $this->get('translator')->trans("The role '%role%' on circle " . "'%scope%' has been removed", array( '%role%' => $this->get('translator')->trans($roleScope->getRole()), '%scope%' => $this->get('chill.main.helper.translatable_string') ->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', array('id' => $pgid))); diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index 298b34e49..120a529d9 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -102,6 +102,8 @@ Role: Rôle Choose amongst roles: Choisir parmi les rôles Add permission: Ajouter les permissions 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 List users: Liste des utilisateurs