From 6b3b1768494d7b2f8699596eee0e15ccab06cd69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sun, 20 Sep 2015 21:47:52 +0200
Subject: [PATCH] Merge add_ui_permission into master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ 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
---
 Resources/config/services.yml          |  1 +
 Security/Authorization/ReportVoter.php | 14 +++++++++++++-
 composer.json                          |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 4d8b4b625..326990d35 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -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
diff --git a/Security/Authorization/ReportVoter.php b/Security/Authorization/ReportVoter.php
index e363923df..e3218fec7 100644
--- a/Security/Authorization/ReportVoter.php
+++ b/Security/Authorization/ReportVoter.php
@@ -21,13 +21,14 @@ namespace Chill\ReportBundle\Security\Authorization;
 
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\ProvideRoleInterface;
 
 /**
  * 
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class ReportVoter extends AbstractChillVoter
+class ReportVoter extends AbstractChillVoter implements ProvideRoleInterface
 {
     const CREATE = 'CHILL_REPORT_CREATE';
     const SEE    = 'CHILL_REPORT_SEE';
@@ -63,4 +64,15 @@ class ReportVoter extends AbstractChillVoter
         
         return $this->helper->userHasAccess($user, $report, $attribute);
     }
+
+    public function getRoles()
+    {
+        return $this->getSupportedAttributes();
+    }
+
+    public function getRolesWithoutScope()
+    {
+        return array();
+    }
+
 }
diff --git a/composer.json b/composer.json
index 197bef509..38e26d831 100644
--- a/composer.json
+++ b/composer.json
@@ -25,9 +25,9 @@
         "doctrine/orm": "~2.4",
         "doctrine/common": "~2.4",
         "doctrine/doctrine-bundle": "~1.2",
-        "chill-project/main": "dev-master@dev",
+        "chill-project/main": "dev-master",
         "chill-project/custom-fields": "dev-master@dev",
-        "chill-project/person": "dev-master@dev",
+        "chill-project/person": "dev-master",
         "champs-libres/composer-bundle-migration": "~1.0",
         "doctrine/doctrine-migrations-bundle": "dev-master@dev",
         "doctrine/migrations": "~1.0@dev"