Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable smartblocks with same criteria to stay separate if created with new criteria

Browse source
This commit is contained in:
Robbt 2019-01-19 21:29:14 -05:00
parent 2b057472ca
commit 8095f6e627
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/models/Block.php
View file

@ -1641,9 +1641,12 @@ SQL;
Logging::info('adding and'); Logging::info('adding and');
$qry->addAnd($spCriteria, $spCriteriaValue, $spCriteriaModifier); $qry->addAnd($spCriteria, $spCriteriaValue, $spCriteriaModifier);
} }
// only add this NOT LIKE null if you aren't also matching on another criteria
if ($i == 0) {
if ($spCriteriaModifier == Criteria::NOT_ILIKE || $spCriteriaModifier == Criteria::NOT_EQUAL) { if ($spCriteriaModifier == Criteria::NOT_ILIKE || $spCriteriaModifier == Criteria::NOT_EQUAL) {
$qry->addOr($spCriteria, null, Criteria::ISNULL); $qry->addOr($spCriteria, null, Criteria::ISNULL);
} }
}
} catch (Exception $e) { } catch (Exception $e) {
Logging::info($e); Logging::info($e);
} }