- Changed filtersupdate to better divide filters for infocenter overview and freigegeben

- Changed infocenterData to retrive overview filters
- Changed infocenterFreigegebenData to retrive freigegeben filters
- Changed InfoCenter controller to load overview and freigegeben filter's names into the left menu
This commit is contained in:
Paolo
2018-07-02 17:40:22 +02:00
parent 6e469c3668
commit 419e53a656
7 changed files with 23 additions and 23 deletions
+6 -6
View File
@@ -297,7 +297,7 @@ class FiltersLib
$this->_ci->load->library('PhrasesLib', array(self::FILTER_PHRASES_CATEGORY));
$tmpFilterNamePhrase = $this->_ci->phraseslib->t(self::FILTER_PHRASES_CATEGORY, $filterJson->namePhrase);
if (isset($tmpFilterNamePhrase) && !isEmptyString($tmpFilterNamePhrase)) // if is not null or an empty string
if (!isEmptyString($tmpFilterNamePhrase)) // if is not null or an empty string
{
$filterName = $tmpFilterNamePhrase;
}
@@ -339,7 +339,7 @@ class FiltersLib
$removeSelectedField = false;
// Checks the parameter selectedField
if (isset($selectedField) && !isEmptyString($selectedField))
if (!isEmptyString($selectedField))
{
// Retrives all the used fields by the current filter
$fields = $this->getElementSession(self::SESSION_FIELDS);
@@ -373,7 +373,7 @@ class FiltersLib
$removeSelectedField = false;
// Checks the parameter selectedField
if (isset($selectedField) && !isEmptyString($selectedField))
if (!isEmptyString($selectedField))
{
// Retrives all the used fields by the current filter
$fields = $this->getElementSession(self::SESSION_FIELDS);
@@ -402,7 +402,7 @@ class FiltersLib
$removeAppliedFilter = false;
// Checks the parameter appliedFilter
if (isset($appliedFilter) && !isEmptyString($appliedFilter))
if (!isEmptyString($appliedFilter))
{
// Retrives all the used fields by the current filter
$fields = $this->getElementSession(self::SESSION_FIELDS);
@@ -490,7 +490,7 @@ class FiltersLib
$addFilter = false;
// Checks the parameter filter
if (isset($filter) && !isEmptyString($filter))
if (!isEmptyString($filter))
{
// Retrives all the used fields by the current filter
$fields = $this->getElementSession(self::SESSION_FIELDS);
@@ -533,7 +533,7 @@ class FiltersLib
$saveCustomFilter = false; // by default returns a failure
// Checks parameter customFilterDescription if not valid stop the execution
if (!isset($customFilterDescription) || isEmptyString($customFilterDescription))
if (isEmptyString($customFilterDescription))
{
return $saveCustomFilter;
}