Merged FD3-201 into master

app/AppKernel.php

@@ -41,6 +41,8 @@ class AppKernel extends Kernel
             new MapBundle\MapBundle(),
             new LeafletBundle\LeafletBundle(),
             new AuthBundle\AuthBundle(),
+            new SimpleThings\EntityAudit\SimpleThingsEntityAuditBundle(),
+            new AuditBundle\AuditBundle()
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

app/config/bundles/ik/audit-bundle/parameters.yml.dist

@@ -0,0 +1,3 @@
+parameters:
+    # Muestra el menú Auditoría
+    audit_show_menu: false

app/config/config.yml

@@ -21,6 +21,7 @@ imports:
     - { resource: "@OwnerVoterBundle/Resources/config/services.yml" }
     - { resource: "@MapBundle/Resources/config/services.yml" }
     - { resource: "@AuthBundle/Resources/config/services.yml" }
+    - { resource: "@AuditBundle/Resources/config/services.yml" }
 
 parameters:
     app_name: ftth

app/config/routing.yml

@@ -64,4 +64,8 @@ admin_tenancy_change_tenancy_global_ajax:
 
 map:
     resource: "@MapBundle/Resources/config/routing.yml"
-    
+
+audit:
+    resource: "@AuditBundle/Controller/"
+    type:     annotation
+    prefix:   /

composer.json

@@ -76,21 +76,28 @@
         },
         {
             "type": "vcs",
-            "url":  "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url":  "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/LeafletBundle.git",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/LeafletBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
         },
         {
             "type": "vcs",
-            "url":  "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
+            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
             "options": {
                 "local_pk": "./keys/bitbucket.id_rsa"
             }
@@ -133,7 +140,8 @@
         "samsonasik/package-versions": "1.1.0",
         "ik/leaflet-bundle": "dev-master",
         "ik/map-bundle": "dev-master",
-        "ik/auth-bundle": "dev-master"
+        "ik/auth-bundle": "dev-master",
+        "ik/audit-bundle": "dev-master"
     },
     "require-dev": {
         "sensio/generator-bundle": "^3.0",
@@ -195,6 +203,9 @@
             },
             {
                 "file": "app/config/bundles/ik/device-bundle/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/ik/audit-bundle/parameters.yml"
             }
         ],
         "branch-alias": null

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": "fd260ad86210b789972a4b87f2f87819",
+    "content-hash": "7dcb08a0fc41379f546be8f5c5031988",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1391,6 +1391,30 @@
             ],
             "time": "2017-01-08T14:13:58+00:00"
         },
+        {
+            "name": "ik/audit-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuditBundle.git",
+                "reference": "deba8813246a14dd17b160e44a35bb4811c13452"
+            },
+            "require": {
+                "simplethings/entity-audit-bundle": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AuditBundle\\": ""
+                }
+            },
+            "description": "The Flowdat3 Audit Bundle",
+            "keywords": [
+                "audit",
+                "bundle"
+            ],
+            "time": "2017-06-27 13:16:34"
+        },
         {
             "name": "ik/auth-bundle",
             "version": "dev-master",
@@ -4201,6 +4225,57 @@
             "description": "A security checker for your composer.lock",
             "time": "2017-08-22T22:18:16+00:00"
         },
+        {
+            "name": "simplethings/entity-audit-bundle",
+            "version": "v1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplethings/EntityAuditBundle.git",
+                "reference": "ee71ea62735797f5b6562590e15cd237edce6489"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplethings/EntityAuditBundle/zipball/ee71ea62735797f5b6562590e15cd237edce6489",
+                "reference": "ee71ea62735797f5b6562590e15cd237edce6489",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/dbal": "~2.5",
+                "doctrine/orm": "~2.4",
+                "php": "^5.3.9|~7.0"
+            },
+            "conflict": {
+                "doctrine/doctrine-bundle": "<1.4",
+                "gedmo/doctrine-extensions": "<2.3.1",
+                "symfony/framework-bundle": "<2.7"
+            },
+            "require-dev": {
+                "doctrine/doctrine-bundle": "~1.4",
+                "fabpot/php-cs-fixer": "^1.11",
+                "gedmo/doctrine-extensions": "^2.3.1",
+                "matthiasnoback/symfony-dependency-injection-test": "^1.0",
+                "phpunit/phpunit": "^4.8",
+                "symfony/framework-bundle": "~2.7|~3.0",
+                "symfony/var-dumper": "^2.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SimpleThings\\EntityAudit\\": "src/SimpleThings/EntityAudit"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "description": "Audit for Doctrine Entities",
+            "keywords": [
+                "Audit",
+                "database",
+                "persistence"
+            ],
+            "time": "2017-07-24T15:38:35+00:00"
+        },
         {
             "name": "sonata-project/admin-bundle",
             "version": "3.22.0",
@@ -5997,7 +6072,8 @@
         "ik/migrations-bundle": 20,
         "ik/leaflet-bundle": 20,
         "ik/map-bundle": 20,
-        "ik/auth-bundle": 20
+        "ik/auth-bundle": 20,
+        "ik/audit-bundle": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,