Merge branch 'master' of https://bitbucket.org/ikflowdat/stats into sprintv06

.drone.yml

@@ -29,12 +29,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 --no-interaction --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
 
@@ -27,6 +28,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" }
@@ -61,6 +62,7 @@ twig:
     globals:
         fd_alerts: '@base_admin.alert_service'
         tenancy_service: '@base_tenancy.tenancy_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"

composer.json

@@ -224,6 +224,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": "473e31584e4af0ad5d5e8b248db675b1",
+    "content-hash": "7c24da369da06dc273d0830c26697678",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1685,7 +1685,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-10-13 13:56:06"
+            "time": "2017-10-13T13:56:06+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",