Agregado del parametro del chequeo de logout

.drone.yml

@@ -31,6 +31,7 @@ pipeline:
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
       - cp app/config/bundles/ik/device-bundle/parameters.yml.drone app/config/bundles/ik/device-bundle/parameters.yml
+      - cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
       - composer install -n --no-progress
       - composer dump-autoload --optimize
       - chmod 0777 -R var/logs var/cache var/sessions

.gitignore

@@ -22,3 +22,4 @@ app/Resources/workflows/workflow_list.yml
 !/web/workflows_png
 /web/workflows_png/*
 !web/workflows_png/.gitkeep
+/app/config/bundles/ik/base-admin-bundle/parameters.yml

Dockerfile

@@ -30,7 +30,8 @@ RUN cp app/config/parameters.yml.docker app/config/parameters.yml ;\
 	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
  	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
  	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml 
+	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
+	cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
 
 CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction --no-progress;\
 	rm var/cache/* -rf ;\
@@ -39,5 +40,7 @@ CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --
  	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
  	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
 	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
+	cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml ;\
     composer run-script post-install-cmd --no-interaction ;\
- 	cat app/config/hwioauthbundle/parameters.yml ; bin/console server:run 0.0.0.0 --env=dev
+ 	cat app/config/hwioauthbundle/parameters.yml ;
+ 	bin/console server:run 0.0.0.0 --env=dev

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

@@ -4,6 +4,7 @@ imports:
     - { resource: services.yml }
     - { resource: rest.yml }
     - { resource: url_webservice.yml }
+    - { resource: "bundles/ik/base-admin-bundle/parameters.yml" }
     - { resource: "@FTTHBundle/Resources/config/services.yml" }
     - { resource: "@WebserviceBundle/Resources/config/services.yml" }
     - { resource: workflow.yml }
@@ -66,7 +67,7 @@ twig:
         token_security: '@security.token_storage'
         owner_voter: '@owner_voter.voter'
         tenancy_service: '@base_tenancy.tenancy_service'
-
+        checked_is_user_logged_in: '%app.checked_is_user_logged_in%'
 # Doctrine Configuration
 doctrine:
     dbal:

app/config/routing.yml

@@ -58,10 +58,6 @@ base_admin_alert:
     type:     annotation
     prefix:   /
 
-admin_tenancy_change_tenancy_global_ajax:
-    path: changeTenancyAjaxAction
-    defaults: { _controller: BaseAdminBundle:RedirectionAjax:changeTenancyAjax }
-
 map:
     resource: "@MapBundle/Resources/config/routing.yml"
 
@@ -69,3 +65,6 @@ audit:
     resource: "@AuditBundle/Controller/"
     type:     annotation
     prefix:   /
+
+base_admin:
+    resource: "@BaseAdminBundle/Resources/config/routing.yml"

composer.json

@@ -125,7 +125,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-219",
         "ik/oauthclient-bundle": "dev-master",
         "ik/webservice-bundle": "dev-master",
         "hwi/oauth-bundle": "^0.5.3",
@@ -206,6 +206,9 @@
             },
             {
                 "file": "app/config/bundles/ik/audit-bundle/parameters.yml"
+            },
+            {
+                "file": "app/config/bundles/ik/base-admin-bundle/parameters.yml"
             }
         ],
         "branch-alias": null