Implementacion de tenencia en NAP

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 }

composer.json

@@ -97,7 +97,7 @@
         "phpunit/phpunit": "5.5.*",
         "stof/doctrine-extensions-bundle": "^1.2",
         "voryx/restgeneratorbundle": "dev-master",
-        "ik/base-admin-bundle": "dev-master",
+        "ik/base-admin-bundle": "dev-FD3-99",
         "ik/oauthclient-bundle": "dev-FD3-99",
         "ik/webservice-bundle": "dev-master",
         "hwi/oauth-bundle": "^0.5.3",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "7657bfe559cf507588889723164e1e3c",
+    "content-hash": "4f8355aad6a372bb638498da6bdaea30",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1393,11 +1393,11 @@
         },
         {
             "name": "ik/base-admin-bundle",
-            "version": "dev-master",
+            "version": "dev-FD3-99",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "b6ad2dfffe165ea3965973074fc78735770f2f9d"
+                "reference": "c000750a1b6ac7239379b36535f7612f0bbdb367"
             },
             "type": "library",
             "autoload": {
@@ -1412,7 +1412,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-01 17:52:58"
+            "time": "2017-08-02 18:09:07"
         },
         {
             "name": "ik/device-bundle",
@@ -1539,10 +1539,10 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/TemplateBundle.git",
-                "reference": "9452c62f90a0574cb1d6c94426655f1b79c571f9"
+                "reference": "63deb64e5ccb88acede62b5aae7c1231353b99df"
             },
             "require": {
-                "ik/base-admin-bundle": "dev-master"
+                "ik/base-admin-bundle": "*"
             },
             "type": "library",
             "autoload": {
@@ -1557,7 +1557,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2017-06-15 15:38:21"
+            "time": "2017-08-02 18:42:10"
         },
         {
             "name": "ik/webservice-bundle",
@@ -2010,7 +2010,7 @@
                     "email": "stof@notk.org"
                 },
                 {
-                    "name": "Knplabs",
+                    "name": "KnpLabs",
                     "homepage": "http://knplabs.com"
                 },
                 {
@@ -2069,7 +2069,7 @@
                     "email": "stof@notk.org"
                 },
                 {
-                    "name": "Knplabs",
+                    "name": "KnpLabs",
                     "homepage": "http://knplabs.com"
                 },
                 {

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/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/Resources/config/services.yml

@@ -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: