fix(ui): geolocation map was broken

flyve-mdm · Nov 3, 2017 · cd5a16d · cd5a16d
1 parent 7734651
commit cd5a16d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/setup.php b/setup.php
@@ -95,6 +95,11 @@ function plugin_init_flyvemdm() {
       $PLUGIN_HOOKS['add_css']['flyvemdm'][] = "css/style.css";
       // Warning 'pluginflyvemdmmenu' MUST be lower case
       $CFG_GLPI['javascript']['admin']['pluginflyvemdmmenu']['Menu'] = ['charts'];
+
+      if (strpos($_SERVER['REQUEST_URI'], "plugins/flyvemdm/front/agent.form.php") !== false) {
+         $PLUGIN_HOOKS['add_css']['flyvemdm'][] = 'lib/leaflet-1.0.3/leaflet.css';
+         $PLUGIN_HOOKS['add_javascript']['flyvemdm'][] = 'lib/leaflet-1.0.3/leaflet.js';
+      }
    }
 }
 

diff --git a/tpl/computer_geolocation.html b/tpl/computer_geolocation.html
@@ -6,7 +6,7 @@
       <div>{{ __('view until', 'flyvemdm') }}{{ endDate|raw }}</div>
       <div><p><a href="#" class="vsubmit" onclick="loadMarkers()">{{ __('update', 'flyvemdm') }}</a></p></div>
    </div>
-   <script  type="text/javascript">
+   <script  type="text/javascript">$(function() {
       var map;
       var markers = [];
 
@@ -64,5 +64,6 @@
 
       showMap();
       loadMarkers();
+   })
    </script>
 </div>