Merge branch '1597-pantalla-en-blanco-en-mapas-de-red-dev' into 'develop'

Fixed null values in js

See merge request artica/pandorafms!1073
This commit is contained in:
vgilc 2017-11-15 13:17:06 +01:00
commit e91bcf8ad5

View File

@ -699,10 +699,25 @@ if (enterprise_installed()) {
}
else {
$networkmap_filter = json_decode($networkmap['filter'], true);
if ($networkmap_filter['x_offs'] != null) {
$map_dash_details['x_offs'] = $networkmap_filter['x_offs'];
}
else {
$map_dash_details['x_offs'] = 0;
}
if ($networkmap_filter['y_offs'] != null) {
$map_dash_details['y_offs'] = $networkmap_filter['y_offs'];
}
else {
$map_dash_details['y_offs'] = 0;
}
if ($networkmap_filter['z_dash'] != null) {
$map_dash_details['z_dash'] = $networkmap_filter['z_dash'];
}
else {
$map_dash_details['z_dash'] = 0;
}
}
}
if ($networkmap === false) {