SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-09-04 10:14:13 +08:00
Code Issues Projects Packages Activity Actions

[Legacy] Update subpanel searchdefs

Browse source
This commit is contained in:
Jack Anderson 2023-02-13 13:48:10 +00:00 • committed by Clemente Raposo
parent 749af57399
commit 788d702494
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/legacy/include/SubPanel/SubPanelDefinitions.php
View file

@ -436,13 +436,13 @@ class aSubPanel
//get value of a property defined at the panel instance level.
public function get_inst_prop_value($name)
{
return isset($this->_instance_properties[$name]) ? $this->_instance_properties [ $name ] : null;
return $this->_instance_properties [$name] ?? null;
}
//get value of a property defined at the panel definition level.
public function get_def_prop_value($name)
{
if (isset($this->panel_definition [ $name ])) {
return $this->panel_definition [ $name ] ;
if (!empty($this->panel_definition[$name])) {
return $this->panel_definition[$name] ;
} else {
return null ;
}
@ -480,10 +480,10 @@ class aSubPanel
//returns the where clause for the query.
public function get_where()
{
if ($this->get_def_prop_value('where') != '' && $this->search_query != '') {
if (!empty($this->get_def_prop_value('where')) && $this->search_query !== '') {
return $this->get_def_prop_value('where').' AND '.$this->search_query;
} else {
if ($this->search_query != '') {
if ($this->search_query !== '') {
return $this->search_query;
}
}