Merge add_ui_permission into master

+ set deps to chill-project/main dev-master

Squashed commit of the following:

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

    switch to role declaration in code

commit 7fba35356ea9266c43a6f104290103071e1c1755
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Aug 31 23:57:59 2015 +0200

    declare role in chill.available_roles parameter
This commit is contained in:
2015-09-20 21:47:52 +02:00
parent f301dbdd17
commit 6b3b176849
3 changed files with 16 additions and 3 deletions

View File

@@ -30,6 +30,7 @@ services:
- "@chill.main.security.authorization.helper"
tags:
- { name: security.voter }
- { name: chill.role }
chill.report.form.report_type:
class: Chill\ReportBundle\Form\ReportType