Browse Source

Merged in FD3-341 (pull request #54)

Agregado de la lectura de las coordenadas por defecto (del archivo user_setting.yml del base) para dibujar el mapa por defecto

Approved-by: Guillermo Espinoza <guillermo@interlink.com.ar>
Gabriel Gosparo 7 years ago
parent
commit
dcf9909592
2 changed files with 7 additions and 3 deletions
  1. 2 2
      composer.lock
  2. 5 1
      src/FTTHBundle/Resources/views/ONU/form.html.twig

+ 2 - 2
composer.lock

@@ -1510,7 +1510,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/ExtraDataBundle.git",
-                "reference": "285c7a279256fc613a0a8e65c6163d5b60361365"
+                "reference": "fdfa90821ff77946aa8a6781da6ac561f52e2b76"
             },
             "type": "library",
             "autoload": {
@@ -1525,7 +1525,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-12-11 15:48:57"
+            "time": "2017-12-27 13:01:33"
         },
         {
             "name": "ik/leaflet-bundle",

+ 5 - 1
src/FTTHBundle/Resources/views/ONU/form.html.twig

@@ -12,7 +12,11 @@
                 modificacion = true;
                 callbackClientId(objSelectClient.val());
             } else {
-                drawMap(-32.030232, -61.220883); // galvez
+                if (_MAP_LATITUDE == 0 && _MAP_LONGITUDE == 0) {
+                    setCoordinatesFromConfig(true);
+                } else {
+                    drawMap(_MAP_LATITUDE, _MAP_LONGITUDE);
+                }
                 $("div[id*='_nap']").find(".select2-chosen").html("");
                 $("select[id*='_nap']").val(0);
             }