Merge branch 'master' of bitbucket.org:ikflowdat/ftth into drone-fix

.drone.yml

@@ -19,8 +19,8 @@ pipeline:
       OAUTH_CLIENT_ID: ""
       OAUTH_CLIENT_SECRET: ""
     commands:
-      - mysqladmin --version
-      - "while ! mysqladmin ping -h 127.0.0.1 --silent; do : sleep 1 ; done"
+      - command -v mysqladmin >/dev/null 2>&1 || { echo "I require mysqladmin but it's not installed.  Aborting." >&2; exit 1; }
+      - while ! mysqladmin ping -h 127.0.0.1 --silent; do :; done
 
       - yes | mysqladmin -h 127.0.0.1 create fd3_ftth
       - yes | mysqladmin -h 127.0.0.1 create fd_session

app/config/url_webservice.yml.dist

@@ -5,7 +5,7 @@ parameters:
 
     client: '%url_base%/api/clients.json'
 
-    sidebar_menu: # urls para el sidebar menu 
+    sidebar_menu: # urls para el sidebar menu
         Base: '%url_base%'
         Mapas: '%url_mapas%'
         Stats: '%url_stats%'
@@ -15,3 +15,4 @@ parameters:
     remote_device_url: '%url_base%/api/devices.json'
     remote_device_log_url: '%url_base%/api/devicelogs.json'
     remote_get_map_url: '%url_mapas%/api/maps.json'
+    remote_get_object_type_url: '%url_mapas%/api/objecttypes.json'