Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/uprel/gisapp

  • Loading branch information...
root
root committed Sep 11, 2019
2 parents eb9c740 + 527445a commit 72649d81a47a5a4ad959d16b9ad8925f4aea7425
Showing with 12 additions and 1 deletion.
  1. +1 −1 client/site/js/WebgisInit_functions.js
  2. +11 −0 client_common/load.php
@@ -781,7 +781,7 @@ function postLoading() {
var geoxy = geoExtMap.map.getLonLatFromPixel(xy);
var nDeci = 0;
if(mapCrsUnits=='degrees') {
nDeci = 4;
nDeci = 5;
}
var currentScale = geoExtMap.map.getScale();
if (currentScale <= 400) {
@@ -43,6 +43,15 @@
if (!property_exists($data, "client_url")) {
$data->client_url = "";
}
if (!property_exists($data, "custom1")) {
$data->custom1 = "";
}
if (!property_exists($data, "custom2")) {
$data->custom2 = "";
}
if (file_exists($client_path . 'admin/resources/images/' . $data->client_name . '.png')) {
$data->client_logo = $gis_projects->path . 'admin/resources/images/' . $data->client_name . '.png';
} else {
@@ -63,6 +72,8 @@
projectData.client_display_name = '<?php echo $data->client_display_name ?>';
projectData.client_url = '<?php echo $data->client_url ?>';
projectData.client_logo = '<?php echo $data->client_logo ?>';
projectData.custom1 = '<?php echo $data->custom1 ?>';
projectData.custom2 = '<?php echo $data->custom2 ?>';
projectData.lang = '<?php echo $lang ?>';

projectData.search = eval(<?php echo json_encode($settings->search) ?>);

0 comments on commit 72649d8

Please sign in to comment.
You can’t perform that action at this time.