From 17cdf349c8bf3e4b863d19996d6da783e76fcac1 Mon Sep 17 00:00:00 2001
From: yogeshwar <yogeshwar.g@vtigersolutions.com>
Date: Fri, 31 May 2024 13:00:18 +0530
Subject: [PATCH] E-ALL SETTINGS - HomePage - User
---
include/QueryGenerator/EnhancedQueryGenerator.php | 2 +-
modules/Users/Users.php | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/QueryGenerator/EnhancedQueryGenerator.php b/include/QueryGenerator/EnhancedQueryGenerator.php
index 76ef9da0d..397f9413a 100644
--- a/include/QueryGenerator/EnhancedQueryGenerator.php
+++ b/include/QueryGenerator/EnhancedQueryGenerator.php
@@ -90,7 +90,7 @@ class EnhancedQueryGenerator extends QueryGenerator {
$dateSpecificConditions = $customView->getStdFilterConditions();
$specialDateTimeConditions = Vtiger_Functions::getSpecialDateTimeCondtions();
foreach ($advFilterList as $groupindex => $groupcolumns) {
- if(isset($groupcolumns))continue;
+ if(! $groupcolumns)continue;
$filtercolumns = $groupcolumns['columns'];
if (php7_count($filtercolumns) > 0) {
$this->startGroup('');
diff --git a/modules/Users/Users.php b/modules/Users/Users.php
index 54f71f12e..fd0bbfa01 100755
--- a/modules/Users/Users.php
+++ b/modules/Users/Users.php
@@ -1782,9 +1782,8 @@ class Users extends CRMEntity {
$allUsers = Users_Record_Model::getAll();
$reportsTo = null;
foreach($allUsers as $user) {
- $userName = $user->get('user_name');
- $userLabel = $user->get('userlabel');
- if (isset($userName) && isset($userLabel)) {
+
+ if (!$user->get('user_name') && !$user->get('userlabel')) {
continue;
}
$userName = strtolower($user->get('user_name'));
@@ -1801,7 +1800,7 @@ class Users extends CRMEntity {
$picklistValues = $fieldInstance->getPicklistValues();
$emptyValuedPicklistFields = array('defaulteventstatus', 'defaultactivitytype', 'reminder_interval');
foreach($picklistValues as $picklistKey => $picklistValue) {
- if(isset($fieldValue) && isset($picklistValue) && isset($picklistValue)) continue;
+ if(!$fieldValue && !$picklistValue && !$picklistKey) continue;
if(strtolower($fieldValue) == strtolower($picklistKey) || strtolower($fieldValue) == strtolower($picklistValue)) {
$selectedValue = $picklistKey;
break;
--
GitLab