mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
A condition with a True action must have a False action. Pick 'none' if not specified
This commit is contained in:
parent
b85e5d0889
commit
0fa73a76a1
@ -366,10 +366,20 @@ class importexport_wizard_basic_import_csv
|
||||
{
|
||||
|
||||
// Clear conditions that don't do anything
|
||||
foreach($content['conditions'] as $key => $condition) {
|
||||
foreach($content['conditions'] as $key => &$condition) {
|
||||
if(($condition['true']['action'] == 'none' || !$condition['true']['action']) && !$condition['true']['stop']
|
||||
&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) && !$condition['false']['stop']) {
|
||||
unset($content['conditions'][$key]);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Check for true without false, or false without true - set to 'none'
|
||||
elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
|
||||
$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
|
||||
!$condition['true'] || !$condition['false']
|
||||
)
|
||||
{
|
||||
$condition[$condition['true']['action'] == '' ? 'true' : 'false']['action'] = "none";
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user