Acl refactoring

This commit is contained in:
Frédéric Guillot
2014-12-31 12:37:15 -05:00
parent 66f150d887
commit 772804add8
93 changed files with 943 additions and 626 deletions

View File

@@ -19,6 +19,7 @@ use Pimple\Container;
* @property \Model\Task $task
* @property \Model\TaskExport $taskExport
* @property \Model\TaskFinder $taskFinder
* @property \Model\UserSession $userSession
*/
abstract class Base
{

View File

@@ -16,7 +16,7 @@ class BootstrapSubscriber extends Base implements EventSubscriberInterface
public function setup()
{
$this->container['config']->setupTranslations();
$this->container['config']->setupTimezone();
$this->config->setupTranslations();
$this->config->setupTimezone();
}
}

View File

@@ -30,14 +30,14 @@ class ProjectActivitySubscriber extends Base implements EventSubscriberInterface
public function execute(GenericEvent $event)
{
// Executed only when someone is logged
if ($this->container['acl']->isLogged() && isset($event['task_id'])) {
if ($this->userSession->isLogged() && isset($event['task_id'])) {
$values = $this->getValues($event);
$this->projectActivity->createEvent(
$values['task']['project_id'],
$values['task']['id'],
$this->acl->getUserId(),
$this->userSession->getId(),
$event->getName(),
$values
);