Merged in FD3-99 (pull request #12)

Tenencias FTTH FD3-99

Approved-by: Guillermo Espinoza <guillermo@interlink.com.ar>

app/config/bundles/ik/device-bundle/parameters.yml

@@ -0,0 +1,6 @@
+# This file is auto-generated during the composer install
+parameters:
+    device_check_url: 'http://127.0.0.1/base/app_dev.php/api/devices/check.json'
+    device_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices.json'
+    device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/device.json'
+    device_put_url: 'http://127.0.0.1/base/app_dev.php/api/device.json'

app/config/config.yml

@@ -62,6 +62,7 @@ twig:
         fd_alerts: '@base_admin.alert_service'
         token_security: '@security.token_storage'
         owner_voter: '@owner_voter.voter'
+        tenancy_service: '@base_tenancy.tenancy_service'
 
 # Doctrine Configuration
 doctrine:
@@ -78,6 +79,8 @@ doctrine:
         auto_generate_proxy_classes: "%kernel.debug%"
         naming_strategy: doctrine.orm.naming_strategy.underscore
         auto_mapping: true
+        filters:
+            tenancy_filter: Base\AdminBundle\Filter\TenancyFilter
 
 stof_doctrine_extensions:
     orm:

app/config/routing.yml

@@ -57,3 +57,7 @@ base_admin_alert:
     resource: "@BaseAdminBundle/Controller/"
     type:     annotation
     prefix:   /
+
+admin_tenancy_change_tenancy_global_ajax:
+    path: changeTenancyAjaxAction
+    defaults: { _controller: BaseAdminBundle:RedirectionAjax:changeTenancyAjax }

src/FTTHBundle/Admin/NAPAdmin.php

@@ -18,8 +18,7 @@ class NAPAdmin extends BaseAdmin
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
-                ->add('name')
-        ;
+            ->add('name');
     }
 
     /**
@@ -28,18 +27,17 @@ class NAPAdmin extends BaseAdmin
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
-                ->add('name')
-                ->add('parent')
-                ->add('onus')
-                ->add('extraData')
-                ->add('_action', null, array(
-                    'actions' => array(
-                        'show' => array(),
-                        'edit' => array(),
-                        'delete' => array(),
-                    )
-                ))
-        ;
+            ->add('name')
+            ->add('parent')
+            ->add('onus')
+            ->add('extraData')
+            ->add('_action', null, array(
+                'actions' => array(
+                    'show' => array(),
+                    'edit' => array(),
+                    'delete' => array(),
+                )
+            ));
     }
 
     /**
@@ -48,10 +46,9 @@ class NAPAdmin extends BaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
-                ->add('name')
-                ->add('parent')
-                ->add('extraData')
-        ;
+            ->add('name')
+            ->add('parent')
+            ->add('extraData');
     }
 
     /**
@@ -60,11 +57,19 @@ class NAPAdmin extends BaseAdmin
     protected function configureShowFields(ShowMapper $showMapper)
     {
         $showMapper
-                ->add('name')
-                ->add('parent')
-                ->add('onus')
-                ->add('extraData')
-        ;
+            ->add('name')
+            ->add('parent')
+            ->add('onus')
+            ->add('extraData');
+    }
+
+    /**
+     * @param mixed $object
+     */
+    public function prePersist($object)
+    {
+        parent::prePersist($object);
+        $this->addTenancyIdFromServicie($object);
     }
 
 }

src/FTTHBundle/Admin/OLTAdmin.php

@@ -58,15 +58,15 @@ class OLTAdmin extends WorkflowBaseAdmin
         $formMapper
                 ->tab('default')
                     ->with('')
-                        ->add('name')
-                        ->add('model')
+            ->add('name')
+            ->add('model')
                     ->end()
                 ->end()
                 ->tab('configuration')
                     ->with('OLT')
-                        ->add('ip')
-                        ->add('snmpCommunity')
-                        ->add('sshUser')
+            ->add('ip')
+            ->add('snmpCommunity')
+            ->add('sshUser')
                         ->add('sshPass')
                     ->end()
                 ->end()
@@ -80,7 +80,6 @@ class OLTAdmin extends WorkflowBaseAdmin
                     ->end()
                 ->end()
         ;
-
     }
 
     /**
@@ -109,4 +108,12 @@ class OLTAdmin extends WorkflowBaseAdmin
             ->end()   
         ;
     }
+    /**
+     * @param mixed $object
+     */
+    public function prePersist($object)
+    {
+        parent::prePersist($object);
+        $this->addTenancyIdFromServicie($object);
+    }
 }

src/FTTHBundle/Admin/OLTModelAdmin.php

@@ -49,10 +49,8 @@ class OLTModelAdmin extends BaseAdmin
      */
     protected function configureFormFields(FormMapper $formMapper)
     {
-
         $marks = ['FiberHome' => 'FiberHome', 'FiberLink' => 'FiberLink'];
         $libraries = ['OIDSFiberHomeV1' => 'OIDSFiberHomeV1'];
-        
         $formMapper
             ->add('name')
             ->add('mark', 'choice', array('required'=>true, 'choices' => $marks))
@@ -75,4 +73,12 @@ class OLTModelAdmin extends BaseAdmin
             ->add('extraData')
         ;
     }
+    /**
+     * @param mixed $object
+     */
+    public function prePersist($object)
+    {
+        parent::prePersist($object);
+        $this->addTenancyIdFromServicie($object);
+    }
 }

src/FTTHBundle/Admin/ONUAdmin.php

@@ -24,8 +24,7 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->add('model')
             ->add('serialNumber')
             ->add('mac')
-            ->add('olt')
-        ;
+            ->add('olt');
     }
 
     /**
@@ -44,7 +43,7 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->add('model')
             ->add('olt')
 //            ->add('workflow')
-            ->add('currentState','string', array('template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'))
+            ->add('currentState', 'string', array('template' => 'WorkflowBundle:Workflow:base_list_field_current_state.html.twig'))
             ->add('_action', 'with-workflow-action', array(
                 'actions' => array(
                     'show' => array(),
@@ -52,8 +51,7 @@ class ONUAdmin extends WorkflowBaseAdmin
                     'delete' => array(),
                     'state' => array('template' => 'WorkflowBundle:Workflow:show_transitions.html.twig')
                 )
-            ))
-        ;
+            ));
     }
 
     /**
@@ -62,23 +60,22 @@ class ONUAdmin extends WorkflowBaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
-                ->tab('default')
-                    ->with('')
-                        ->add('clientId')
-                        ->add('ponSerialNumber')
-                        ->add('profile')
-                        ->add('nap')
-                        ->add('model')
-                    ->end()
-                ->end()
-                ->tab('Avanzado')
-                    ->with('ONU')
-                        ->add('serialNumber')
-                        ->add('mac')
-                        ->add('olt')
-                    ->end()
-                ->end()
-        ;
+            ->tab('default')
+            ->with('')
+            ->add('clientId')
+            ->add('ponSerialNumber')
+            ->add('profile')
+            ->add('nap')
+            ->add('model')
+            ->end()
+            ->end()
+            ->tab('Avanzado')
+            ->with('ONU')
+            ->add('serialNumber')
+            ->add('mac')
+            ->add('olt')
+            ->end()
+            ->end();
     }
 
     /**
@@ -88,32 +85,40 @@ class ONUAdmin extends WorkflowBaseAdmin
     {
         $showMapper
             ->tab('default')
-                ->with('')
-                    ->add('clientId')
-                    ->add('ponSerialNumber')
-                    ->add('profile')
-                    ->add('nap')
-                    ->add('model')
-                ->end()
+            ->with('')
+            ->add('clientId')
+            ->add('ponSerialNumber')
+            ->add('profile')
+            ->add('nap')
+            ->add('model')
+            ->end()
             ->end()
             ->tab('Avanzado')
-                ->with('ONU')
-                    ->add('serialNumber')
-                    ->add('mac')
-                    ->add('olt')
-                    ->add('currentState')
-                ->end()
-            ->end()    
+            ->with('ONU')
+            ->add('serialNumber')
+            ->add('mac')
+            ->add('olt')
+            ->add('currentState')
+            ->end()
+            ->end()
             ->tab('Log')
-                ->with('Log')
-                    ->add('log','string', array('template' => 'FTTHBundle:ONU:show_log.html.twig'))
-                    ->add('deviceLog','string', array(
-                        'template' => 'DeviceBundle::show_device_log.html.twig',
-                        'translation_domain' => 'DeviceBundle',
-                        ))
-                ->end()
-            ->end()        
-        ;
+            ->with('Log')
+            ->add('log', 'string', array('template' => 'FTTHBundle:ONU:show_log.html.twig'))
+            ->add('deviceLog', 'string', array(
+                'template' => 'DeviceBundle::show_device_log.html.twig',
+                'translation_domain' => 'DeviceBundle',
+            ))
+            ->end()
+            ->end();
+    }
+
+    /**
+     * @param mixed $object
+     */
+    public function prePersist($object)
+    {
+        parent::prePersist($object);
+        $this->addTenancyIdFromServicie($object);
     }
 
 }

src/FTTHBundle/Admin/ONUModelAdmin.php

@@ -16,8 +16,7 @@ class ONUModelAdmin extends BaseAdmin
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
-            ->add('name')
-        ;
+            ->add('name');
     }
 
     /**
@@ -34,8 +33,7 @@ class ONUModelAdmin extends BaseAdmin
                     'edit' => array(),
                     'delete' => array(),
                 )
-            ))
-        ;
+            ));
     }
 
     /**
@@ -45,8 +43,7 @@ class ONUModelAdmin extends BaseAdmin
     {
         $formMapper
             ->add('name')
-            ->add('extraData')
-        ;
+            ->add('extraData');
     }
 
     /**
@@ -56,7 +53,16 @@ class ONUModelAdmin extends BaseAdmin
     {
         $showMapper
             ->add('name')
-            ->add('extraData')
-        ;
+            ->add('extraData');
     }
+
+    /**
+     * @param mixed $object
+     */
+    public function prePersist($object)
+    {
+        parent::prePersist($object);
+        $this->addTenancyIdFromServicie($object);
+    }
+
 }

src/FTTHBundle/Admin/ProfileAdmin.php

@@ -2,13 +2,14 @@
 
 namespace FTTHBundle\Admin;
 
+use Base\AdminBundle\Admin\BaseAdmin;
 use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
 
-class ProfileAdmin extends AbstractAdmin
+class ProfileAdmin extends BaseAdmin
 {
     /**
      * @param DatagridMapper $datagridMapper
@@ -18,8 +19,7 @@ class ProfileAdmin extends AbstractAdmin
         $datagridMapper
             ->add('name')
             ->add('upload')
-            ->add('download')
-        ;
+            ->add('download');
     }
 
     /**
@@ -38,8 +38,7 @@ class ProfileAdmin extends AbstractAdmin
                     'edit' => array(),
                     'delete' => array(),
                 )
-            ))
-        ;
+            ));
     }
 
     /**
@@ -51,8 +50,7 @@ class ProfileAdmin extends AbstractAdmin
             ->add('name')
             ->add('upload')
             ->add('download')
-            ->add('extraData')
-        ;
+            ->add('extraData');
     }
 
     /**
@@ -64,7 +62,16 @@ class ProfileAdmin extends AbstractAdmin
             ->add('name')
             ->add('upload')
             ->add('download')
-            ->add('extraData')
-        ;
+            ->add('extraData');
     }
+
+    /**
+     * @param mixed $object
+     */
+    public function prePersist($object)
+    {
+        parent::prePersist($object);
+        $this->addTenancyIdFromServicie($object);
+    }
+
 }

src/FTTHBundle/Entity/NAP.php

@@ -2,6 +2,8 @@
 
 namespace FTTHBundle\Entity;
 
+use Base\AdminBundle\Traits\TenancyIdTrait;
+use Base\AdminBundle\Traits\TenancyIdTraitInterface;
 use Doctrine\ORM\Mapping as ORM;
 use ExtraDataBundle\Entity\Traits\ExtraDataWithParentTrait;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -10,15 +12,16 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table
  * @ORM\Entity
  */
-class NAP
+class NAP implements TenancyIdTraitInterface
 {
 
     use ExtraDataWithParentTrait;
     use ONUTrait;
+    use TenancyIdTrait;
 
     // Cantidad máxima de ONU por NAP
     const MAX_NUMBER_ONU = 64;
-    
+
     /**
      * @var int
      *
@@ -32,7 +35,7 @@ class NAP
      * @var string
      *
      * @ORM\Column(type="string", length=255)
-     * 
+     *
      * @Assert\NotNull
      */
     private $name;
@@ -41,19 +44,19 @@ class NAP
      * @ORM\ManyToOne(targetEntity="NAP", fetch="EXTRA_LAZY")
      */
     protected $parent;
-        
+
     /**
      * @ORM\OneToMany(targetEntity="ONU", mappedBy="nap", fetch="EXTRA_LAZY")
      */
     protected $onus;
 
-     
+
     /**
      * @return string
      */
     public function __toString()
     {
-        return (string) $this->name;
+        return (string)$this->name;
     }
 
     /**
@@ -96,7 +99,7 @@ class NAP
 
     /**
      * @param NAP $parent
-     * 
+     *
      * @return $this
      */
     public function setParent($parent = null)

src/FTTHBundle/Entity/OLT.php

@@ -2,6 +2,8 @@
 
 namespace FTTHBundle\Entity;
 
+use Base\AdminBundle\Traits\TenancyIdTrait;
+use Base\AdminBundle\Traits\TenancyIdTraitInterface;
 use Doctrine\ORM\Mapping as ORM;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
@@ -16,11 +18,11 @@ use DeviceBundle\Interfaces\DeviceInterface;
  * 
  * @ValidatorAssert\Device
  */
-class OLT implements DeviceInterface
+class OLT implements DeviceInterface, TenancyIdTraitInterface
 {
 
     use ExtraDataTrait;
-
+    use TenancyIdTrait;
     /**
      * @var bigint $id
      *
@@ -79,13 +81,6 @@ class OLT implements DeviceInterface
      */
     protected $model;
 
-    /**
-     * @var int $tenancyId
-     *
-     * @ORM\Column(type="integer", nullable=false, options={"default":1})
-     */
-    protected $tenancyId = 1;
-
     /**
      * @ORM\OneToMany(targetEntity="ONU", mappedBy="olt", fetch="EXTRA_LAZY")
      */
@@ -188,14 +183,6 @@ class OLT implements DeviceInterface
         return $this->sshPass;
     }
 
-    /**
-     * @return int
-     */
-    public function getTenancyId()
-    {
-        return $this->tenancyId;
-    }
-
     /**
      * @param string $name
      * @return $this
@@ -300,17 +287,6 @@ class OLT implements DeviceInterface
         return $this;
     }
 
-    /**
-     * @param int $tenancyId
-     * @return $this
-     */
-    public function setTenancyId($tenancyId)
-    {
-        $this->tenancyId = $tenancyId;
-
-        return $this;
-    }
-
     /**
      * @return Workflow
      */

src/FTTHBundle/Entity/OLTModel.php

@@ -2,6 +2,8 @@
 
 namespace FTTHBundle\Entity;
 
+use Base\AdminBundle\Traits\TenancyIdTrait;
+use Base\AdminBundle\Traits\TenancyIdTraitInterface;
 use Doctrine\ORM\Mapping as ORM;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -10,11 +12,11 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table
  * @ORM\Entity
  */
-class OLTModel
+class OLTModel implements TenancyIdTraitInterface
 {
 
     use ExtraDataTrait;
-    
+    use TenancyIdTrait;
     /**
      * @var int
      *

src/FTTHBundle/Entity/ONU.php

@@ -2,6 +2,8 @@
 
 namespace FTTHBundle\Entity;
 
+use Base\AdminBundle\Traits\TenancyIdTrait;
+use Base\AdminBundle\Traits\TenancyIdTraitInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
@@ -20,14 +22,14 @@ use JMS\Serializer\Annotation as JMS;
  * @ORM\HasLifecycleCallbacks
  * @UniqueEntity(fields={"ponSerialNumber", "tenancyId"}, message="errors.duplicate_key")
  * @ORM\Table(uniqueConstraints={@ORM\UniqueConstraint(name="unique_idx", columns={"pon_serial_number", "tenancy_id"})})
- * 
+ *
  * @ValidatorAssert\Device
  */
-class ONU implements DeviceInterface
+class ONU implements DeviceInterface, TenancyIdTraitInterface
 {
 
     use ExtraDataTrait;
-
+    use TenancyIdTrait;
     /**
      * @var int
      *
@@ -87,17 +89,17 @@ class ONU implements DeviceInterface
     protected $updated;
 
     /**
-     * @ORM\Column(type="string", nullable=true) 
+     * @ORM\Column(type="string", nullable=true)
      */
     protected $currentState = null;
 
     /**
-     * @ORM\Column(type="string", nullable=true, options={"default": "active"}) 
+     * @ORM\Column(type="string", nullable=true, options={"default": "active"})
      */
     protected $administrativeState = 'active';
 
     /**
-     * @ORM\Column(type="string", nullable=false, options={"default": "success"}) 
+     * @ORM\Column(type="string", nullable=false, options={"default": "success"})
      */
     protected $transitionState = 'success';
 
@@ -126,13 +128,6 @@ class ONU implements DeviceInterface
      */
     protected $profile;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(type="integer", nullable=false, options={"default":1})
-     */
-    protected $tenancyId = 1;
-
     /**
      * @ORM\ManyToOne(targetEntity="\WorkflowBundle\Entity\Workflow", fetch="EXTRA_LAZY")
      * @ORM\JoinColumn(name="workflow_id", referencedColumnName="id", onDelete="SET NULL")
@@ -144,7 +139,7 @@ class ONU implements DeviceInterface
      * @var int
      *
      * @ORM\Column(type="integer", nullable=false, options={"default": "0"})
-     * 
+     *
      * @Assert\Callback({"FTTHBundle\Validator\ONUPositionValidator", "validate"})
      */
     private $position = 0;
@@ -155,7 +150,7 @@ class ONU implements DeviceInterface
      */
     public function __toString()
     {
-        return (string) $this->ponSerialNumber;
+        return (string)$this->ponSerialNumber;
     }
 
     /**
@@ -368,20 +363,6 @@ class ONU implements DeviceInterface
         return $this;
     }
 
-    /**
-     * Set tenancyId
-     *
-     * @param int $tenancyId
-     *
-     * @return ONU
-     */
-    public function setTenancyId($tenancyId)
-    {
-        $this->tenancyId = $tenancyId;
-
-        return $this;
-    }
-
     /**
      * @return OLT
      */
@@ -430,7 +411,7 @@ class ONU implements DeviceInterface
 
     /**
      * @param NAP $nap
-     * 
+     *
      * @return $this
      */
     public function setNap($nap)
@@ -459,16 +440,6 @@ class ONU implements DeviceInterface
         return $this;
     }
 
-    /**
-     * Get tenancyId
-     *
-     * @return int
-     */
-    public function getTenancyId()
-    {
-        return $this->tenancyId;
-    }
-
     /**
      * @return Workflow
      */
@@ -530,7 +501,7 @@ class ONU implements DeviceInterface
     }
 
     /**
-     *  @ORM\PrePersist 
+     * @ORM\PrePersist
      */
     public function prePersist(LifecycleEventArgs $event)
     {
@@ -604,7 +575,7 @@ class ONU implements DeviceInterface
      * De lo contrario recorre y retorna la primer position
      * desocupada dentro del rango de ONUs que esten asociadas
      * al NAP
-     * 
+     *
      * @return int
      */
     public function getNewPosition()
@@ -645,18 +616,18 @@ class ONU implements DeviceInterface
         $deviceData['tenancyId'] = $this->tenancyId;
 
         $deviceExtraData = array('mac' => $this->mac, 'serialNumber' => $this->serialNumber, 'ponSerialNumber' => $this->ponSerialNumber,
-                                 'clientId' => $this->clientId);
+            'clientId' => $this->clientId);
 
-        ($this->olt)? $olt = $this->getOlt()->getId() : $olt = null;
-        ($this->model)? $model = $this->getModel()->getId() : $model = null;
-        ($this->nap)? $nap = $this->getNap()->getId() : $nap = null;
-        ($this->profile)? $profile = $this->getProfile()->getId() : $profile = null;
+        ($this->olt) ? $olt = $this->getOlt()->getId() : $olt = null;
+        ($this->model) ? $model = $this->getModel()->getId() : $model = null;
+        ($this->nap) ? $nap = $this->getNap()->getId() : $nap = null;
+        ($this->profile) ? $profile = $this->getProfile()->getId() : $profile = null;
 
         $deviceExtraData['oltId'] = $olt;
         $deviceExtraData['modelId'] = $model;
         $deviceExtraData['napId'] = $nap;
         $deviceExtraData['profileId'] = $profile;
-        
+
 
         $deviceData['extraData'] = json_encode($deviceExtraData);
 

src/FTTHBundle/Entity/ONUModel.php

@@ -2,6 +2,8 @@
 
 namespace FTTHBundle\Entity;
 
+use Base\AdminBundle\Traits\TenancyIdTrait;
+use Base\AdminBundle\Traits\TenancyIdTraitInterface;
 use Doctrine\ORM\Mapping as ORM;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -10,12 +12,13 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table
  * @ORM\Entity
  */
-class ONUModel
+class ONUModel implements TenancyIdTraitInterface
 {
     
     use ExtraDataTrait;
     use ONUTrait;
-    
+    use TenancyIdTrait;
+
     /**
      * @var int
      *

src/FTTHBundle/Entity/Profile.php

@@ -2,6 +2,8 @@
 
 namespace FTTHBundle\Entity;
 
+use Base\AdminBundle\Traits\TenancyIdTrait;
+use Base\AdminBundle\Traits\TenancyIdTraitInterface;
 use Doctrine\ORM\Mapping as ORM;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -10,11 +12,12 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table
  * @ORM\Entity
  */
-class Profile
+class Profile implements TenancyIdTraitInterface
 {
- 
+
     use ExtraDataTrait;
     use ONUTrait;
+    use TenancyIdTrait;
 
     /**
      * @var int
@@ -45,22 +48,22 @@ class Profile
      *
      * @ORM\Column(type="bigint", nullable=true)
      */
-    private $download;   
+    private $download;
 
     /**
      * @ORM\OneToMany(targetEntity="ONU", mappedBy="profile", fetch="EXTRA_LAZY")
      */
     protected $onus;
-    
-    
+
+
     /**
      * @return string
      */
     public function __toString()
     {
-        return (string) $this->name;
+        return (string)$this->name;
     }
-    
+
     /**
      * @return int
      */
@@ -128,5 +131,5 @@ class Profile
     {
         return $this->download;
     }
-    
+
 }

src/FTTHBundle/Resources/config/services.yml

@@ -17,7 +17,7 @@ services:
 
     ftth.admin.olt_model:
         class: FTTHBundle\Admin\OLTModelAdmin
-        arguments: [~, FTTHBundle\Entity\OLTModel, SonataAdminBundle:CRUD]
+        arguments: [~, FTTHBundle\Entity\OLTModel, BaseAdminBundle:CRUD]
         tags:
             - { name: sonata.admin, manager_type: orm, group: FTTH, label: OLTModel, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
         calls:    
@@ -25,7 +25,7 @@ services:
 
     ftth.admin.onu_model:
         class: FTTHBundle\Admin\ONUModelAdmin
-        arguments: [~, FTTHBundle\Entity\ONUModel, SonataAdminBundle:CRUD]
+        arguments: [~, FTTHBundle\Entity\ONUModel, BaseAdminBundle:CRUD]
         tags:
             - { name: sonata.admin, manager_type: orm, group: FTTH, label: ONUModel, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
         calls:    
@@ -33,7 +33,7 @@ services:
 
     ftth.admin.profile:
         class: FTTHBundle\Admin\ProfileAdmin
-        arguments: [~, FTTHBundle\Entity\Profile, SonataAdminBundle:CRUD]
+        arguments: [~, FTTHBundle\Entity\Profile, BaseAdminBundle:CRUD]
         tags:
             - { name: sonata.admin, manager_type: orm, group: FTTH, label: Profile, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
         calls:    
@@ -41,7 +41,7 @@ services:
 
     ftth.admin.nap:
         class: FTTHBundle\Admin\NAPAdmin
-        arguments: [~, FTTHBundle\Entity\NAP, SonataAdminBundle:CRUD]
+        arguments: [~, FTTHBundle\Entity\NAP, BaseAdminBundle:CRUD]
         tags:
             - { name: sonata.admin, manager_type: orm, group: FTTH, label: NAP, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
         calls: