+
+ {%- if role_scope.scope is not null -%}
+
+ {{ role_scope.scope.name|localize_translatable_string }}
+
+ {%- else -%}
+ N/A
+ {%- endif -%}
+ |
{{ role_scope.role|trans|replace({'(⚑)': ''}) }}
{% if expanded_roles[role_scope.role]|length > 1 %}
@@ -48,15 +57,6 @@
{% endif %}
|
-
- {%- if role_scope.scope is not null -%}
-
- {{ role_scope.scope.name|localize_translatable_string }}
-
- {%- else -%}
- N/A
- {%- endif -%}
- |
{{ form_start(delete_role_scopes_form[role_scope.id]) }}
{{ form_widget(delete_role_scopes_form[role_scope.id].submit, { 'attr': { 'class': 'btn btn-remove' } } ) }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
index 140c6b9aa..e457fd913 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/PermissionsGroup/show.html.twig
@@ -22,14 +22,20 @@
- {{ 'Role'|trans }} |
{{ 'Circle'|trans }} |
+ {{ 'Role'|trans }} |
{% for role_scope in role_scopes %}
+ {%- if role_scope.scope is not null -%}
+ {{ role_scope.scope.name|localize_translatable_string }}
+ {%- else -%}
+ N/A
+ {%- endif -%}
+ |
{{ role_scope.role|trans|replace({'(⚑)': ''}) }}
{% if expanded_roles[role_scope.role]|length > 1 %}
@@ -44,12 +50,6 @@
{% endif %}
|
- {%- if role_scope.scope is not null -%}
- {{ role_scope.scope.name|localize_translatable_string }}
- {%- else -%}
- N/A
- {%- endif -%}
- |
{% endfor %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 53619952c..0acaffe79 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -167,7 +167,7 @@ Permissionsgroup: Groupe de permissions
New permission group: Nouveau groupe de permissions
PermissionsGroup "%name%" edit: Modification du groupe de permission '%name%'
Role: Rôle
-Choose amongst roles: Choisir parmi les rôles
+Choose amongst roles: Choisir un rôle
Choose amongst scopes: Choisir un cercle
Add permission: Ajouter les permissions
This group does not provide any permission: Ce groupe n'attribue aucune permission
|