Agregado del archivos parameters.yml

Agregado del routing.yml del base-admin-bundle

Configuracion del cierre de session circular

.drone.yml

@@ -21,12 +21,13 @@ pipeline:
       
       - echo 'client = Flowdat3-Stats-Drone-Test' | tee /etc/flowdat.conf
 
+      - cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
       - composer install -n --no-progress
       - chmod 0777 -R var/logs var/cache var/sessions
       - php bin/console doctrine:schema:update --force -vvv --env=test
-      - vendor/phpunit/phpunit/phpunit --tap
+      - vendor/phpunit/phpunit/phpunit --tap -c phpunit.xml.dist
 
  docker:
    repo : docker.infra.flowdat.com/fd3/stats

.gitignore

@@ -16,4 +16,5 @@
 /vendor/
 /web/bundles/
 /app/config/bundles/ik/webservice-bundle/parameters.yml
+/app/config/bundles/ik/base-admin-bundle/parameters.yml
 /app/config/bundles/hwi/oauth-bundle/parameters.yml

Dockerfile

@@ -4,6 +4,7 @@ EXPOSE 8000
 ADD . /opt/stats
 
 RUN rm /opt/stats/var/cache/* -rf
+RUN cp /opt/stats/app/config/bundles/ik/base-admin-bundle/parameters.yml.dist /opt/stats/app/config/bundles/ik/base-admin-bundle/parameters.yml
 
 WORKDIR /opt/stats
 
@@ -15,6 +16,7 @@ CMD  eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install -
      cp app/config/parameters.yml.docker app/config/parameters.yml ;\
      cp app/config/bundles/hwi/oauth-bundle/parameters.yml.docker app/config/bundles/hwi/oauth-bundle/parameters.yml ;\
      cp app/config/bundles/ik/webservice-bundle/parameters.yml.docker app/config/bundles/ik/webservice-bundle/parameters.yml ;\
+     cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml ;\
      composer dump-autoload ;\
      composer run-script symfony-scripts --no-interaction ;\
      bin/console server:run 0.0.0.0

app/config/bundles/ik/base-admin-bundle/parameters.yml.dist

@@ -0,0 +1,3 @@
+parameters:
+    # el valor esta en segundos
+    app.checked_is_user_logged_in: 600

app/config/config.yml

@@ -5,6 +5,7 @@ imports:
     
     - { resource: "bundles/friendsofsymfony/rest-bundle/config.yml" }
     - { resource: "bundles/ik/webservice-bundle/parameters.yml" }
+    - { resource: "bundles/ik/base-admin-bundle/parameters.yml" }
     - { resource: "bundles/hwi/oauth-bundle/parameters.yml" }
     - { resource: "@BaseOAuthClientBundle/Resources/config/services.yml" }
     - { resource: "@BaseOAuthClientBundle/Resources/config/hwioauthbundle/services.yml" }
@@ -60,6 +61,7 @@ twig:
     strict_variables: '%kernel.debug%'
     globals:
         fd_alerts: '@base_admin.alert_service'
+        checked_is_user_logged_in: '%app.checked_is_user_logged_in%'
 
 # Doctrine Configuration
 doctrine:

app/config/routing.yml

@@ -51,10 +51,6 @@ base_oauth_client:
 base_hwioauthbundle_oauth_client:
     resource: "@BaseOAuthClientBundle/Resources/config/hwioauthbundle/routing.yml"    
 
-admin_tenancy_change_tenancy_global_ajax:
-    path: changeTenancyAjaxAction
-    defaults: { _controller: BaseAdminBundle:RedirectionAjax:changeTenancyAjax }
-
 baseadmin_alert:
     resource: "@BaseAdminBundle/Controller"
     type:     annotation
@@ -62,4 +58,7 @@ baseadmin_alert:
 audit:
     resource: "@AuditBundle/Controller/"
     type:     annotation
-    prefix:   /
+    prefix:   /
+
+base_admin:
+    resource: "@BaseAdminBundle/Resources/config/routing.yml"

bin/symfony_requirements

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
+require_once dirname(__FILE__).'/./SymfonyRequirements.php';
 
 $lineSize = 70;
 $symfonyRequirements = new SymfonyRequirements();

composer.json

@@ -130,7 +130,7 @@
         "doctrine/doctrine-migrations-bundle": "^1.2",
         "doctrine/orm": "^2.5",
         "ik/audit-bundle": "dev-master",
-        "ik/base-admin-bundle": "dev-master",
+        "ik/base-admin-bundle": "dev-FD3-219",
         "ik/device-bundle": "dev-master",
         "ik/extra-data-bundle": "dev-master",
         "ik/leaflet-bundle": "dev-master",
@@ -215,6 +215,9 @@
             },
             {
                 "file": "app/config/bundles/ik/audit-bundle/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/ik/base-admin-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": "9537de2fe076710e88c8f05bceddb60a",
+    "content-hash": "996b0244d2feb78b910eefd08fc66be5",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1413,7 +1413,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-06-27 13:16:34"
+            "time": "2017-06-27T13:16:34+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1436,15 +1436,15 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-09-22 13:27:29"
+            "time": "2017-09-22T13:27:29+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
-            "version": "dev-master",
+            "version": "dev-FD3-219",
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "a572826cd5ddffb5c028b0262441b205c6cd52fb"
+                "reference": "a2775d243ea35546eb38c30fb794f44307527074"
             },
             "type": "library",
             "autoload": {
@@ -1459,7 +1459,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-09-19 12:44:49"
+            "time": "2017-09-28T15:28:13+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1482,7 +1482,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-09-15 14:14:26"
+            "time": "2017-09-15T14:14:26+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1505,7 +1505,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-09-26 14:16:42"
+            "time": "2017-09-26T14:16:42+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1526,7 +1526,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-09-01 15:52:53"
+            "time": "2017-09-01T15:52:53+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1549,7 +1549,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-08-31 11:49:28"
+            "time": "2017-08-31T11:49:28+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1576,7 +1576,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-08-24 15:50:04"
+            "time": "2017-08-24T15:50:04+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1599,7 +1599,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2017-06-12T15:49:24+00:00"
         },
         {
             "name": "ik/redis-bundle",
@@ -1623,7 +1623,7 @@
                 "php-redis-service",
                 "redis"
             ],
-            "time": "2017-08-09 18:29:16"
+            "time": "2017-08-09T18:29:16+00:00"
         },
         {
             "name": "ik/stats/fiberhome-bundle",
@@ -1644,7 +1644,7 @@
                 "Fiberhome",
                 "Flowdat 3"
             ],
-            "time": "2017-08-23 14:30:32"
+            "time": "2017-08-23T14:30:32+00:00"
         },
         {
             "name": "ik/stats/geoserver-bundle",
@@ -1665,7 +1665,7 @@
                 "Flowdat 3",
                 "Geoserver"
             ],
-            "time": "2017-08-29 15:11:22"
+            "time": "2017-08-29T15:11:22+00:00"
         },
         {
             "name": "ik/stats/huawei-bundle",
@@ -1686,7 +1686,7 @@
                 "Flowdat 3",
                 "Huawei"
             ],
-            "time": "2017-09-28 12:52:28"
+            "time": "2017-09-28T12:52:28+00:00"
         },
         {
             "name": "ik/statsd-bundle",
@@ -1707,7 +1707,7 @@
                 "stats",
                 "statsd"
             ],
-            "time": "2017-07-25 18:45:31"
+            "time": "2017-07-25T18:45:31+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1715,7 +1715,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "9ca153996372b0e67788c32628b2fa49a43e3e13"
+                "reference": "749b493bc12e3e7043cd9d16023e9e940498939f"
             },
             "require": {
                 "ext-curl": "*",
@@ -1728,7 +1728,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-09-15 13:40:56"
+            "time": "2017-09-28T12:29:30+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -2572,7 +2572,7 @@
                 "oss_snmp",
                 "snmp"
             ],
-            "time": "2017-06-10 07:30:59"
+            "time": "2017-06-10T07:30:59+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -5854,7 +5854,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18 12:29:38"
+            "time": "2016-04-18T12:29:38+00:00"
         },
         {
             "name": "webmozart/assert",

web/config.php

@@ -22,7 +22,7 @@ if (!in_array(@$_SERVER['REMOTE_ADDR'], array(
     exit('This script is only accessible from localhost.');
 }
 
-require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
+require_once dirname(__FILE__).'/./SymfonyRequirements.php';
 
 $symfonyRequirements = new SymfonyRequirements();