From 0bcb93f9dc547a11b3cd5f8d1e1400221edc3368 Mon Sep 17 00:00:00 2001
From: "chaitanya@vtiger.com" <chaitanya@vtiger.com>
Date: Wed, 5 Jun 2024 22:03:30 +0530
Subject: [PATCH 1/5] E_ALL cleanups in RSS,Our sites and Recyclebin

---
 layouts/v7/modules/Portal/EditView.tpl                |  8 ++++----
 layouts/v7/modules/Portal/ModuleHeader.tpl            |  2 +-
 layouts/v7/modules/Rss/ModuleHeader.tpl               |  2 +-
 .../v7/modules/Vtiger/uitypes/DateFieldSearchView.tpl |  8 ++++----
 layouts/v7/modules/Vtiger/uitypes/FieldSearchView.tpl |  2 +-
 .../Vtiger/uitypes/PickListFieldSearchView.tpl        |  4 ++--
 modules/Portal/actions/DeleteAjax.php                 |  6 +++++-
 modules/Portal/views/List.php                         |  4 ++--
 .../v7/modules/RecycleBin/ListViewContents.tpl        | 11 +++++++----
 .../RecycleBin/modules/RecycleBin/views/List.php      | 11 ++++++-----
 10 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/layouts/v7/modules/Portal/EditView.tpl b/layouts/v7/modules/Portal/EditView.tpl
index c0a826d59..4e19e5c89 100644
--- a/layouts/v7/modules/Portal/EditView.tpl
+++ b/layouts/v7/modules/Portal/EditView.tpl
@@ -13,10 +13,10 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<form class="form-horizontal" id="saveBookmark" method="POST" action="index.php">
-				<input type="hidden" name="record" value="{$RECORD}" />
+				<input type="hidden" name="record" value="{(isset($RECORD)) ? $RECORD : ''}" />
 				<input type="hidden" name="module" value="{$MODULE}" />
 				<input type="hidden" name="action" value="SaveAjax" />
-				{if $RECORD}
+				{if isset($RECORD) && $RECORD}
 					{assign var="TITLE" value= {vtranslate('LBL_EDIT_BOOKMARK', $MODULE)}}
 				{else}
 					{assign var="TITLE" value={vtranslate('LBL_ADD_NEW_BOOKMARK', $MODULE)}}
@@ -29,7 +29,7 @@
 							<label class="pull-right">{vtranslate('LBL_BOOKMARK_NAME', $MODULE)}&nbsp;<span class="redColor">*</span></label>
 						</div>
 						<div class="col-lg-5">
-							<input type="text" name="bookmarkName" id="bookmarkName" class="col-lg-6 inputElement" {if $RECORD} value="{$BOOKMARK_NAME}" {/if} placeholder="{vtranslate('LBL_ENTER_BOOKMARK_NAME', $MODULE)}" data-rule-required="true"/>
+							<input type="text" name="bookmarkName" id="bookmarkName" class="col-lg-6 inputElement" {if isset($RECORD)} value="{$BOOKMARK_NAME}" {else} value="" {/if} placeholder="{vtranslate('LBL_ENTER_BOOKMARK_NAME', $MODULE)}" data-rule-required="true"/>
 						</div>
 						<div class="col-lg-2"></div>
 					</div>
@@ -40,7 +40,7 @@
 							<label class="pull-right">{vtranslate('LBL_BOOKMARK_URL', $MODULE)}&nbsp;<span class="redColor">*</span></label>
 						</div>
 						<div class="col-lg-5">
-							<input type="text" class="inputElement" name="bookmarkUrl" id="bookmarkUrl" {if $RECORD} value="{$BOOKMARK_URL}" {/if} placeholder="{vtranslate('LBL_ENTER_URL', $MODULE)}" data-rule-required="true" data-rule-url="true"/>
+							<input type="text" class="inputElement" name="bookmarkUrl" id="bookmarkUrl" {if isset($RECORD)} value="{$BOOKMARK_NAME}" {else} value="" {/if} placeholder="{vtranslate('LBL_ENTER_URL', $MODULE)}" data-rule-required="true" data-rule-url="true"/>
 						</div>
 						<div class="col-lg-2"></div>
 					</div>
diff --git a/layouts/v7/modules/Portal/ModuleHeader.tpl b/layouts/v7/modules/Portal/ModuleHeader.tpl
index 28a544b64..14256ea8b 100644
--- a/layouts/v7/modules/Portal/ModuleHeader.tpl
+++ b/layouts/v7/modules/Portal/ModuleHeader.tpl
@@ -25,7 +25,7 @@
 				<span>
 					<p class="current-filter-name pull-left">&nbsp;<span class="fa fa-angle-right" aria-hidden="true"></span>&nbsp;{$VIEW}&nbsp;</p>
 				</span>
-				{if $VIEWID}
+				{if isset($VIEWID) && $VIEWID}
 					{foreach item=FILTER_TYPES from=$CUSTOM_VIEWS}
 						{foreach item=FILTERS from=$FILTER_TYPES}
 							{if $FILTERS->get('cvid') eq $VIEWID}
diff --git a/layouts/v7/modules/Rss/ModuleHeader.tpl b/layouts/v7/modules/Rss/ModuleHeader.tpl
index 3f9180b97..d1cc3ea19 100644
--- a/layouts/v7/modules/Rss/ModuleHeader.tpl
+++ b/layouts/v7/modules/Rss/ModuleHeader.tpl
@@ -27,7 +27,7 @@
 				<span>
 					<p class="current-filter-name pull-left">&nbsp;<span class="fa fa-angle-right" aria-hidden="true"></span>&nbsp;{$VIEW}&nbsp;</p>
 				</span>
-				{if $VIEWID}
+				{if isset($VIEWID) && $VIEWID}
 					{foreach item=FILTER_TYPES from=$CUSTOM_VIEWS}
 						{foreach item=FILTERS from=$FILTER_TYPES}
 							{if $FILTERS->get('cvid') eq $VIEWID}
diff --git a/layouts/v7/modules/Vtiger/uitypes/DateFieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/DateFieldSearchView.tpl
index f2031c717..df85ff6be 100644
--- a/layouts/v7/modules/Vtiger/uitypes/DateFieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/DateFieldSearchView.tpl
@@ -10,9 +10,9 @@
  ********************************************************************************/
 -->*}
 {strip}
-    {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
-    {assign var="dateFormat" value=$USER_MODEL->get('date_format')}
-    <div class="row-fluid">
-        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement dateField" data-date-format="{$dateFormat}" data-calendar-type="range" value="{$SEARCH_INFO['searchValue']}" data-fieldinfo='{$FIELD_INFO|escape}'  data-field-type="{$FIELD_MODEL->getFieldDataType()}"/>
+    {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
+    {assign var="dateFormat" value=$USER_MODEL->get('date_format')}
+    <div class="row-fluid">
+        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement dateField" data-date-format="{$dateFormat}" data-calendar-type="range" value="{if isset($SEARCH_INFO['searchValue'])}{$SEARCH_INFO['searchValue']}{/if}" data-fieldinfo='{$FIELD_INFO|escape}'  data-field-type="{$FIELD_MODEL->getFieldDataType()}"/>
     </div>
 {/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Vtiger/uitypes/FieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/FieldSearchView.tpl
index 2ca1d6b73..2c16c15ab 100644
--- a/layouts/v7/modules/Vtiger/uitypes/FieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/FieldSearchView.tpl
@@ -12,6 +12,6 @@
 {strip}
     {assign var="FIELD_INFO" value=Zend_Json::encode($FIELD_MODEL->getFieldInfo())}
     <div class="">
-        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement" value="{$SEARCH_INFO['searchValue']|escape}" data-field-type="{$FIELD_MODEL->getFieldDataType()}" data-fieldinfo='{$FIELD_INFO|escape}'/>
+        <input type="text" name="{$FIELD_MODEL->get('name')}" class="listSearchContributor inputElement" value="{if isset($SEARCH_INFO['searchValue'])}{$SEARCH_INFO['searchValue']|escape}{/if}" data-field-type="{$FIELD_MODEL->getFieldDataType()}" data-fieldinfo='{$FIELD_INFO|escape}'/>
     </div>
 {/strip}
diff --git a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
index 1cff92060..98144d143 100644
--- a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
@@ -13,12 +13,12 @@
     {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
 	{assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
 	{assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
-    {assign var=SEARCH_VALUES value=explode(',',$SEARCH_INFO['searchValue'])}
+    {assign var=SEARCH_VALUES value=explode(',',(isset($SEARCH_INFO['searchValue'])) ? $SEARCH_INFO['searchValue'] : ',')}
     <div class="select2_search_div">
         <input type="text" class="listSearchContributor inputElement select2_input_element"/>
         <select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}' style="display:none">
         {foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
-                <option value="{$PICKLIST_KEY}" {if in_array($PICKLIST_KEY,$SEARCH_VALUES) && ($PICKLIST_KEY neq "") } selected{/if}>{$PICKLIST_LABEL}</option>
+                <option value="{$PICKLIST_KEY}" {if isset($SEARCH_VALUES) && in_array($PICKLIST_KEY,$SEARCH_VALUES) && ($PICKLIST_KEY neq "") } selected{/if}>{$PICKLIST_LABEL}</option>
         {/foreach}
     </select>
     </div>
diff --git a/modules/Portal/actions/DeleteAjax.php b/modules/Portal/actions/DeleteAjax.php
index 73ce6af6f..93e6ff0ea 100644
--- a/modules/Portal/actions/DeleteAjax.php
+++ b/modules/Portal/actions/DeleteAjax.php
@@ -18,7 +18,11 @@ class Portal_DeleteAjax_Action extends Vtiger_DeleteAjax_Action {
     public function process(Vtiger_Request $request) {
         $recordId = $request->get('record');
         $module = $request->getModule();
-        Portal_Module_Model::deleteRecord($recordId);
+        $recordModel = Vtiger_Record_Model::getInstanceById($recordId, $module);
+        if ($recordModel) {
+            $moduleModel = new Portal_Module_Model();
+            $moduleModel->deleteRecord($recordModel);
+        }
         
         $response = new Vtiger_Response();
 		$response->setResult(array('message'=>  vtranslate('LBL_RECORD_DELETED_SUCCESSFULLY', $module)));
diff --git a/modules/Portal/views/List.php b/modules/Portal/views/List.php
index bda02b40f..3950be781 100644
--- a/modules/Portal/views/List.php
+++ b/modules/Portal/views/List.php
@@ -98,7 +98,7 @@ class Portal_List_View extends Vtiger_Index_View {
 		}
 
 		// preProcess is already loading this, we can reuse
-		if(!$this->pagingModel){
+		if(!property_exists($this, 'pagingModel') || !$this->pagingModel){
 			$pagingModel = new Vtiger_Paging_Model();
 			$pagingModel->set('page', $pageNumber);
 			$pagingModel->set('viewid', $request->get('viewname'));
@@ -109,7 +109,7 @@ class Portal_List_View extends Vtiger_Index_View {
 		$listviewEntries = $listViewModel->getListViewEntries($pagingModel);
 
 		//if list view entries restricted to show, paging should not fail
-		if(!$this->noOfEntries) {
+		if(!property_exists($this, 'noOfEntries') || !$this->noOfEntries) {
 			$noOfEntries = php7_count($listviewEntries);
 		}
 
diff --git a/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ListViewContents.tpl b/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ListViewContents.tpl
index 3deda6aee..7bf48d3b9 100644
--- a/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ListViewContents.tpl
+++ b/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ListViewContents.tpl
@@ -78,9 +78,12 @@
                         {foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
                             <th>
                                 {assign var=FIELD_UI_TYPE_MODEL value=$LISTVIEW_HEADER->getUITypeModel()}
-                                {include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$SOURCE_MODULE)
-                                            FIELD_MODEL= $LISTVIEW_HEADER SEARCH_INFO=$SEARCH_DETAILS[$LISTVIEW_HEADER->getName()] USER_MODEL=$CURRENT_USER_MODEL}
-                                <input type="hidden" class="operatorValue" value="{$SEARCH_DETAILS[$LISTVIEW_HEADER->getName()]['comparator']}">
+                                {if isset($SEARCH_DETAILS[$LISTVIEW_HEADER->getName()])}
+                                    {assign var=SEARCH_INFO value=$SEARCH_DETAILS[$LISTVIEW_HEADER->getName()]}
+                                    {include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$SOURCE_MODULE)
+                                        FIELD_MODEL= $LISTVIEW_HEADER SEARCH_INFO=$SEARCH_DETAILS[$LISTVIEW_HEADER->getName()] USER_MODEL=$CURRENT_USER_MODEL}
+                                {/if}
+                                <input type="hidden" class="operatorValue" value="{(isset($SEARCH_DETAILS[$LISTVIEW_HEADER->getName()])) ? $SEARCH_DETAILS[$LISTVIEW_HEADER->getName()]['comparator'] : ''}">
                             </th>
                         {/foreach}
                         </tr>
@@ -137,7 +140,7 @@
                                     <div class="emptyRecordsContent" style="padding-top:15%;">
                                         {assign var=SINGLE_MODULE value="SINGLE_$MODULE"}
                                         {vtranslate('LBL_NO_RECORDS_FOUND', $MODULE)} {vtranslate($SOURCE_MODULE, $SOURCE_MODULE)}.
-                                        {if $IS_MODULE_EDITABLE}
+                                        {if isset($IS_MODULE_EDITABLE) && $IS_MODULE_EDITABLE}
                                             <a style="color:blue" href="{$MODULE_MODEL->getCreateRecordUrl()}"> {vtranslate('LBL_CREATE')}</a>
                                             {if Users_Privileges_Model::isPermitted($MODULE, 'Import') && $LIST_VIEW_MODEL->isImportEnabled()}
                                                 {vtranslate('LBL_OR', $MODULE)}
diff --git a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/views/List.php b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/views/List.php
index 7e4fd0e50..e705ac80a 100644
--- a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/views/List.php
+++ b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/views/List.php
@@ -85,6 +85,7 @@ class RecycleBin_List_View extends Vtiger_Index_View {
 			$operator = $request->get('operator');
 			$searchParams = $request->get('search_params');
 			$listHeaders = $request->get('list_headers', array());
+			$starFilterMode = $request->get('starFilterMode');
 
 			$orderParams = Vtiger_ListView_Model::getSortParamsSession($moduleName . '_' . $sourceModule);
 		if ($request->get('mode') == 'removeSorting') {
@@ -92,7 +93,7 @@ class RecycleBin_List_View extends Vtiger_Index_View {
 			$orderBy = '';
 			$sortOrder = '';
 		}
-		if (empty($listHeaders)) {
+		if(empty($listHeaders) && $orderParams && isset($orderParams['list_headers'])) {
 			$listHeaders = $orderParams['list_headers'];
 		}
 		if (empty($orderBy) && empty($searchValue) && empty($pageNumber) && empty($searchParams)) {
@@ -143,7 +144,7 @@ class RecycleBin_List_View extends Vtiger_Index_View {
 		$linkModels = $moduleModel->getListViewMassActions($linkParams);
 
 		 // preProcess is already loading this, we can reuse
-		if (!$this->pagingModel) {
+		if (!property_exists($this, 'pagingModel') || !$this->pagingModel) {
 			$pagingModel = new Vtiger_Paging_Model();
 			$pagingModel->set('page', $pageNumber);
 		} else {
@@ -171,14 +172,14 @@ class RecycleBin_List_View extends Vtiger_Index_View {
 			}
 		}
 
-		if(!$this->listViewHeaders){
+		if(!property_exists($this, 'listViewHeaders') || !$this->listViewHeaders){
 			$this->listViewHeaders = $listViewModel->getListViewHeaders();
 		}
-		if(!$this->listViewEntries){
+		if(!property_exists($this, 'listViewEntries') || !$this->listViewEntries){
 			$this->listViewEntries = $listViewModel->getListViewEntries($pagingModel);
 		}
 
-		if(!$this->pagingModel){
+		if(!property_exists($this, 'pagingModel') || !$this->pagingModel){
 			$this->pagingModel = $pagingModel;
 		}
 
-- 
GitLab


From 5ee3a03074abd75cd66fcd023a10a25bc55bf3ed Mon Sep 17 00:00:00 2001
From: "chaitanya@vtiger.com" <chaitanya@vtiger.com>
Date: Fri, 7 Jun 2024 09:59:47 +0530
Subject: [PATCH 2/5] E_ALL cleanups in RSS,Our sites and Recyclebin

---
 layouts/v7/modules/Portal/EditView.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/v7/modules/Portal/EditView.tpl b/layouts/v7/modules/Portal/EditView.tpl
index 4e19e5c89..1deca59c1 100644
--- a/layouts/v7/modules/Portal/EditView.tpl
+++ b/layouts/v7/modules/Portal/EditView.tpl
@@ -40,7 +40,7 @@
 							<label class="pull-right">{vtranslate('LBL_BOOKMARK_URL', $MODULE)}&nbsp;<span class="redColor">*</span></label>
 						</div>
 						<div class="col-lg-5">
-							<input type="text" class="inputElement" name="bookmarkUrl" id="bookmarkUrl" {if isset($RECORD)} value="{$BOOKMARK_NAME}" {else} value="" {/if} placeholder="{vtranslate('LBL_ENTER_URL', $MODULE)}" data-rule-required="true" data-rule-url="true"/>
+							<input type="text" class="inputElement" name="bookmarkUrl" id="bookmarkUrl" {if isset($RECORD)} value="{$BOOKMARK_URL}" {else} value="" {/if} placeholder="{vtranslate('LBL_ENTER_URL', $MODULE)}" data-rule-required="true" data-rule-url="true"/>
 						</div>
 						<div class="col-lg-2"></div>
 					</div>
-- 
GitLab


From 1045fbc6540134d28eeaa90b5b9bae7585a3330c Mon Sep 17 00:00:00 2001
From: "chaitanya@vtiger.com" <chaitanya@vtiger.com>
Date: Fri, 7 Jun 2024 17:00:29 +0530
Subject: [PATCH 3/5] E_ALL cleanups in RSS,Our sites and Recyclebin

---
 .../modules/Vtiger/uitypes/PickListFieldSearchView.tpl   | 6 +++++-
 .../layouts/v7/modules/RecycleBin/ListViewContents.tpl   | 9 +++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
index 98144d143..bc8439bda 100644
--- a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
@@ -13,7 +13,11 @@
     {assign var=FIELD_INFO value=$FIELD_MODEL->getFieldInfo()}
 	{assign var=PICKLIST_VALUES value=$FIELD_INFO['picklistvalues']}
 	{assign var=FIELD_INFO value=Vtiger_Util_Helper::toSafeHTML(Zend_Json::encode($FIELD_INFO))}
-    {assign var=SEARCH_VALUES value=explode(',',(isset($SEARCH_INFO['searchValue'])) ? $SEARCH_INFO['searchValue'] : ',')}
+    {if isset($SEARCH_INFO['searchValue']) && $SEARCH_INFO['searchValue'] !== null}
+        {assign var=SEARCH_VALUES value=explode(',', $SEARCH_INFO['searchValue'])}
+    {else}
+        {assign var=SEARCH_VALUES value=explode(',', '')}
+    {/if}
     <div class="select2_search_div">
         <input type="text" class="listSearchContributor inputElement select2_input_element"/>
         <select class="select2 listSearchContributor" name="{$FIELD_MODEL->get('name')}" multiple data-fieldinfo='{$FIELD_INFO|escape}' style="display:none">
diff --git a/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ListViewContents.tpl b/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ListViewContents.tpl
index 7bf48d3b9..8df5005a9 100644
--- a/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ListViewContents.tpl
+++ b/pkg/vtiger/modules/RecycleBin/layouts/v7/modules/RecycleBin/ListViewContents.tpl
@@ -78,12 +78,13 @@
                         {foreach item=LISTVIEW_HEADER from=$LISTVIEW_HEADERS}
                             <th>
                                 {assign var=FIELD_UI_TYPE_MODEL value=$LISTVIEW_HEADER->getUITypeModel()}
+                                {assign var=FIELD_SEARCH_INFO value=array("searchValue" => "", "comparator" => "")}
                                 {if isset($SEARCH_DETAILS[$LISTVIEW_HEADER->getName()])}
-                                    {assign var=SEARCH_INFO value=$SEARCH_DETAILS[$LISTVIEW_HEADER->getName()]}
-                                    {include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$SOURCE_MODULE)
-                                        FIELD_MODEL= $LISTVIEW_HEADER SEARCH_INFO=$SEARCH_DETAILS[$LISTVIEW_HEADER->getName()] USER_MODEL=$CURRENT_USER_MODEL}
+                                    {assign var=FIELD_SEARCH_INFO value=$SEARCH_DETAILS[$LISTVIEW_HEADER->getName()]}
                                 {/if}
-                                <input type="hidden" class="operatorValue" value="{(isset($SEARCH_DETAILS[$LISTVIEW_HEADER->getName()])) ? $SEARCH_DETAILS[$LISTVIEW_HEADER->getName()]['comparator'] : ''}">
+                                {include file=vtemplate_path($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(),$SOURCE_MODULE)
+                                            FIELD_MODEL= $LISTVIEW_HEADER SEARCH_INFO=$FIELD_SEARCH_INFO USER_MODEL=$CURRENT_USER_MODEL}
+                                <input type="hidden" class="operatorValue" value="{$FIELD_SEARCH_INFO['comparator']}">
                             </th>
                         {/foreach}
                         </tr>
-- 
GitLab


From 11fe2f1fe13eeecdd10acc3ccbfb00289bdc2a38 Mon Sep 17 00:00:00 2001
From: "chaitanya@vtiger.com" <chaitanya@vtiger.com>
Date: Fri, 7 Jun 2024 20:55:13 +0530
Subject: [PATCH 4/5] E_ALL cleanups in RSS,Our sites and Recyclebin

---
 layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
index bc8439bda..fa6ea010f 100644
--- a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
@@ -16,7 +16,7 @@
     {if isset($SEARCH_INFO['searchValue']) && $SEARCH_INFO['searchValue'] !== null}
         {assign var=SEARCH_VALUES value=explode(',', $SEARCH_INFO['searchValue'])}
     {else}
-        {assign var=SEARCH_VALUES value=explode(',', '')}
+        {assign var=SEARCH_VALUES value=[]}
     {/if}
     <div class="select2_search_div">
         <input type="text" class="listSearchContributor inputElement select2_input_element"/>
-- 
GitLab


From ee47c5af496cc9e0dfa3106d3878226208525a40 Mon Sep 17 00:00:00 2001
From: "chaitanya@vtiger.com" <chaitanya@vtiger.com>
Date: Mon, 10 Jun 2024 11:13:44 +0530
Subject: [PATCH 5/5] E_ALL cleanups in RSS,Our sites and Recyclebin

---
 layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
index fa6ea010f..302187d31 100644
--- a/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/PickListFieldSearchView.tpl
@@ -16,7 +16,7 @@
     {if isset($SEARCH_INFO['searchValue']) && $SEARCH_INFO['searchValue'] !== null}
         {assign var=SEARCH_VALUES value=explode(',', $SEARCH_INFO['searchValue'])}
     {else}
-        {assign var=SEARCH_VALUES value=[]}
+        {assign var=SEARCH_VALUES value=array()}
     {/if}
     <div class="select2_search_div">
         <input type="text" class="listSearchContributor inputElement select2_input_element"/>
-- 
GitLab