[Mapbender-commits] r9899 - trunk/mapbender/http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Apr 18 06:29:07 PDT 2018
Author: armin11
Date: 2018-04-18 06:29:07 -0700 (Wed, 18 Apr 2018)
New Revision: 9899
Modified:
trunk/mapbender/http/javascripts/initWmcObj.php
Log:
Fix - don't show permission warning if external wms is loaded via get api
Modified: trunk/mapbender/http/javascripts/initWmcObj.php
===================================================================
--- trunk/mapbender/http/javascripts/initWmcObj.php 2018-04-17 07:11:29 UTC (rev 9898)
+++ trunk/mapbender/http/javascripts/initWmcObj.php 2018-04-18 13:29:07 UTC (rev 9899)
@@ -314,6 +314,7 @@
$inputLayerArray = $getApi->getLayers();
if ($inputLayerArray) {
foreach ($inputLayerArray as $input) {
+
// just make it work for a single layer id
$wmsFactory = new UniversalWmsFactory();
try {
@@ -543,20 +544,26 @@
// remove all WMS with no permission
$e = new mb_notice("initWmcObj.php: get wms without permission");
$deniedIdsArray = $wmcGetApi->getWmsWithoutPermission($currentUser);
+
$deniedIdsTitles = array();
$deniedIdsIndices = array();
foreach ($deniedIdsArray as $i) {
- $deniedIdsTitles[]= array(
- "id" => $i["id"],
- "index" => $i["index"],
- "title" => $i["title"]
- );
- $deniedIdsIndices[]= $i["index"];
+ if ($i["id"] !== 0) {
+ $deniedIdsTitles[]= array(
+ "id" => $i["id"],
+ "index" => $i["index"],
+ "title" => $i["title"]
+ );
+ $deniedIdsIndices[]= $i["index"];
+ }
}
+
$resultObj["noPermission"]["wms"] = array_merge(
$resultObj["noPermission"]["wms"],
$deniedIdsTitles
);
+
+
$e = new mb_notice("initWmcObj.php: list of wms without permission created");
$wmcGetApi->removeWms($deniedIdsIndices);
$e = new mb_notice("initWmcObj.php: wms without permission removed from wmc");
More information about the Mapbender_commits
mailing list