diff --git a/core/api/mobile.api.php b/core/api/mobile.api.php index e392cad4..4985e93d 100755 --- a/core/api/mobile.api.php +++ b/core/api/mobile.api.php @@ -245,21 +245,21 @@ function saveMenuFromAppV2($menu, $mobile){ $healthPlugins = []; $deamons_infos = []; $objectsPanel = []; - $pluginPanelMobile = []; - $pluginPanelDesktop= []; + //$pluginPanelMobile = []; + //$pluginPanelDesktop= []; foreach ((plugin::listPlugin()) as $plugin) { $obArray = utils::o2a($plugin); $objectId = $obArray['id']; $objectName = $obArray['name']; - if($plugin->getMobile() != '' || $plugin->getDisplay() != ''){ + if($plugin->getMobile() != '' && $plugin->getMobile() != 'panel'){ $objectsPanel[$objectId] = $objectName; - if($plugin->getMobile() != 'panel'){ + /*if($plugin->getMobile() != 'panel'){ array_push($pluginPanelMobile, $objectId); } - if($plugin->getDisplay() == 'panel' || $plugin->getMobile() == 'panel'){ + if( $plugin->getMobile() == 'panel'){ $objectsPanel[$objectId] = $objectName; array_push($pluginPanelDesktop, $objectId); - } + } */ } $update = $plugin->getUpdate(); if(is_object($update)){ @@ -275,8 +275,8 @@ function saveMenuFromAppV2($menu, $mobile){ array_push($arrayPlugins, $pluginUpdateArray); } } - config::save('pluginPanelMobile', $pluginPanelMobile, 'mobile'); - config::save('pluginPanelDesktop', $pluginPanelDesktop, 'mobile'); + //config::save('pluginPanelMobile', $pluginPanelMobile, 'mobile'); + //config::save('pluginPanelDesktop', $pluginPanelDesktop, 'mobile'); $return[$idBox]['informations']['objects']['panel'] = $objectsPanel; $categories = []; foreach (jeedom::getConfiguration('eqLogic:category') as $key => $value) { diff --git a/core/class/mobile.class.php b/core/class/mobile.class.php index d336abfa..72acb55b 100755 --- a/core/class/mobile.class.php +++ b/core/class/mobile.class.php @@ -1120,13 +1120,14 @@ public static function configMenuCustom($eqId, $jeedomVersion) } else if ($typeObject == 'plan') { ${'tabUrl' . $i} = "/index.php?v={$webviewUrl}&p=plan&plan_id={$objectId}"; } else if ($typeObject == 'panel') { - $pluginPanelMobile = config::byKey('pluginPanelMobile', 'mobile'); - $pluginPanelDesktop = config::byKey('pluginPanelDesktop', 'mobile'); - if(in_array($objectId, $pluginPanelDesktop)){ + ${'tabUrl' . $i} = "/index.php?v=m&p={$objectId}"; + //$pluginPanelMobile = config::byKey('pluginPanelMobile', 'mobile'); + //$pluginPanelDesktop = config::byKey('pluginPanelDesktop', 'mobile'); + /* if(in_array($objectId, $pluginPanelDesktop)){ ${'tabUrl' . $i} = "/index.php?v=d&m={$objectId}&p=panel"; }else if(in_array($objectId, $pluginPanelMobile)){ ${'tabUrl' . $i} = "/index.php?v=m&p={$objectId}"; - } + }*/ //$test = "/index.php?v=m&p={$objectId}"; //log::add('mobile', 'debug', 'PANEL : ' .$test);