From e6c9cd46e48e619d5e7c5a674c24e6a172ee14fa Mon Sep 17 00:00:00 2001
From: yogeshwar <yogeshwar.g@vtigersolutions.com>
Date: Wed, 5 Jun 2024 11:57:15 +0530
Subject: [PATCH] E-All PickList Dependency
---
.../v7/modules/Settings/PickListDependency/DependencyGraph.tpl | 2 +-
modules/PickList/DependentPickListUtils.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/layouts/v7/modules/Settings/PickListDependency/DependencyGraph.tpl b/layouts/v7/modules/Settings/PickListDependency/DependencyGraph.tpl
index fe456c44a..d47e8bae5 100644
--- a/layouts/v7/modules/Settings/PickListDependency/DependencyGraph.tpl
+++ b/layouts/v7/modules/Settings/PickListDependency/DependencyGraph.tpl
@@ -87,7 +87,7 @@
{foreach key=TARGET_VALUE item=TRANSLATED_TARGET_VALUE from=$TARGET_PICKLIST_VALUES}
<tr>
{foreach key=SOURCE_PICKLIST_VALUE item=TRANSLATED_SOURCE_PICKLIST_VALUE from=$SOURCE_PICKLIST_VALUES}
- {assign var=targetValues value=(isset($MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]])) ? $MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]] : ''}
+ {assign var=targetValues value=(isset($MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]])) ? $MAPPED_TARGET_PICKLIST_VALUES[$SAFEHTML_SOURCE_PICKLIST_VALUES[$SOURCE_PICKLIST_VALUE]] : []}
{assign var=IS_SELECTED value=false}
{if empty($targetValues) || in_array($TARGET_VALUE, $targetValues)}
{assign var=IS_SELECTED value=true}
diff --git a/modules/PickList/DependentPickListUtils.php b/modules/PickList/DependentPickListUtils.php
index 4a8fbf619..75e68eb93 100644
--- a/modules/PickList/DependentPickListUtils.php
+++ b/modules/PickList/DependentPickListUtils.php
@@ -170,7 +170,7 @@ class Vtiger_DependencyPicklist {
$targetValues = decode_html($adb->query_result($result, $i, 'targetvalues'));
$unserializedTargetValues = Zend_Json::decode(html_entity_decode($targetValues));
$criteria = decode_html($adb->query_result($result, $i, 'criteria'));
- $unserializedCriteria = isset($criteria) ? Zend_Json::decode(html_entity_decode($criteria)) : '';
+ $unserializedCriteria = isset($criteria) ? Zend_Json::decode(html_entity_decode($criteria)) : array();
if(!empty($unserializedCriteria) && $unserializedCriteria['fieldname'] != null) {
$conditionValue = array(
--
GitLab