merging add_ui_permission into master

refs #573

Squashed commit of the following:

commit 33635722c231a3a80518e0dc027911766a95cbfa
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Sun Sep 20 21:42:37 2015 +0200

    translation of roles

commit 18d96fe59f836564ace5e6045fa87ac81da6b27b
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Sun Sep 20 11:54:46 2015 +0200

    remove admin menu for person bundle

commit 2acd79930e28fda315d97df2c0ff8aae33ab489a
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Sep 18 21:05:00 2015 +0200

    add logger to project

commit 724d2fc8685fced0cf9da77e9e9730c5c57337ed
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Sep 14 00:50:01 2015 +0200

    switch to role declaration in code

commit 10f6219b277445b0dfeb51fa0b7566a28fdd41bf
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Aug 31 23:51:47 2015 +0200

    declare role in parameter chill.available_roles
This commit is contained in:
2015-09-20 21:44:08 +02:00
parent 2f0197aff3
commit 31aa50b4ea
9 changed files with 29 additions and 43 deletions

View File

@@ -70,16 +70,6 @@ chill_person_accompanying_period_open:
path: /{_locale}/person/{person_id}/accompanying-period/open
defaults: { _controller: ChillPersonBundle:AccompanyingPeriod:open }
chill_person_admin:
path: /{_locale}/admin/person
defaults: { _controller: ChillPersonBundle:Admin:index }
options:
menus:
admin:
order: 100
label: menu.person.admin.index
helper: menu.person.admin.helper
chill_person_export:
path: /{_locale}/person/export/
defaults: { _controller: ChillPersonBundle:Person:export }

View File

@@ -47,3 +47,4 @@ services:
- "@chill.main.security.authorization.helper"
tags:
- { name: security.voter }
- { name: chill.role }

View File

@@ -72,3 +72,8 @@ Reset: 'Remise à zéro'
#timeline
'An accompanying period is opened for %person% on %date%': Une période d'accompagnement a été ouverte le %date% pour %person%
'An accompanying period is closed for %person% on %date%': Une période d'accompagnement a été fermée le %date% pour %person%
#roles
CHILL_PERSON_SEE: Voir les personnes
CHILL_PERSON_UPDATE: Modifier les personnes
CHILL_PERSON_CREATE: Ajouter des personnes