Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/FD3-480'

Luciano Andrade 6 gadi atpakaļ
vecāks
revīzija
71204e18c8
2 mainītis faili ar 15 papildinājumiem un 7 dzēšanām
  1. 1 1
      Resources/config/services.yml
  2. 14 6
      Services/TemplateService.php

+ 1 - 1
Resources/config/services.yml

@@ -1,7 +1,7 @@
 services:
     template.template_service:
         class: TemplateBundle\Services\TemplateService
-        arguments: ['@doctrine.orm.entity_manager']
+        arguments: ['@doctrine.orm.entity_manager', '@base_audit_reader.audit_reader_service']
 
     sonata.admin.template:
         class: TemplateBundle\Admin\TemplateAdmin

+ 14 - 6
Services/TemplateService.php

@@ -2,8 +2,10 @@
 
 namespace TemplateBundle\Services;
 
+use Base\AdminBundle\Controller\AuditReaderService;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use SimpleThings\EntityAudit\AuditReader;
 use TemplateBundle\Entity\Template;
 
 class TemplateService
@@ -15,6 +17,10 @@ class TemplateService
      * @var EntityManagerInterface
      */
     private $entityManager;
+    /**
+     * @var AuditReaderService
+     */
+    private $auditReader;
 
     /**
      * @var EntityRepository
@@ -24,10 +30,12 @@ class TemplateService
 
     /**
      * @param EntityManagerInterface $entityManager
+     * @param AuditReader $auditReader
      */
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(EntityManagerInterface $entityManager, AuditReaderService $auditReader)
     {
         $this->entityManager = $entityManager;
+        $this->auditReader = $auditReader;
         $this->templateRepository = $entityManager->getRepository('TemplateBundle:Template');
     }
 
@@ -53,14 +61,14 @@ class TemplateService
     {
         $content = null;
         $template = $this->getTemplateByName($name);
-        $params = array('em' => $this->entityManager) + $params;
+        $params = array('em' => $this->entityManager, 'baars' => $this->auditReader) + $params;
         if (!is_null($template)) {
             $content = $this->render($template, $params, $engine);
-    	    var_dump($content);
+            var_dump($content);
             $filename = $this->createFile($content, $filename);
-    	} else {
-    		throw new \Exception("Template {$name} not found");
-    	}
+        } else {
+            throw new \Exception("Template {$name} not found");
+        }
 
         return $filename;
     }