SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-08-29 07:50:08 +08:00
Code Issues Projects Packages Activity Actions

Squashed 'public/legacy/' changes from ee41ae127f..f7552f5bda

Browse source 
f7552f5bda SuiteCRM 7.13.4 Release
614f2ff6c1 Fix #9601 - Fix bug where report conditions parenthesis pairs would not save correctly.
d09a78597f Fix #10033 - PHP Fatal error Uncaught TypeError PHP8
47081de512 Fix #10051 - Add some context to the remove of ACLs during module installation
cc1d098646 Fix #9654 - Fix issue with different date formats being compared for change log
18a66f059e Fix #9816 - $item is an array, no object
723eed40a1 Fix #9516 - getRelatedId returns null instad of string
4d2496aec7 Fix #10050 - Add missing language definitions for the module loader
77a55cde25 Fix #10029 - Dashlet not changing on save
75a05ea946 Fix #10035 - Monitored Folders not selectable for Basic Auth Accounts
3991e127a8 Fix #10091 - login parameter failing
f53af1ae32 Fix #10097 - AOP Config not saving
60727e0259 Fix #9937 - Resolve high memory usage when performing bulk relationship changes
706edbb853 Fix #8682 - Workflow fails with relationship condition
9bbf5a1dba Fix #9548 - Wrong decimal precision returned in a Modify Record workflow action
8023ea003f Fix #10034 - Email Listview doesn't render, so no Emails are visible.
b9c1ee1968 Improve codeception variable usage to simplify usage
ecc1a8f128 Fix #10047 - Tasks due date not saving

git-subtree-dir: public/legacy
git-subtree-split: f7552f5bdad7e99c6ae69c78923ab6592656e7a5
This commit is contained in:
SAgility Dev 2023-06-30 09:51:14 +00:00
parent 601c0c039b
commit 03101b9e99
34 changed files with 958 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/AOR_Conditions/AOR_Condition.php
View file

@ -122,11 +122,11 @@ class AOR_Condition extends Basic
}
}
}
if ($field_name == 'parenthesis' && $post_data[$key . $field_name][$i] == 'END') {
if (!isset($lastParenthesisStartConditionId)) {
if ($field_name === 'parenthesis' && $post_data[$key . $field_name][$i] !== 'START') {
if (!isset($lastParenthesisStartConditionIds)) {
throw new Exception('a closure parenthesis has no starter pair');
}
$condition->parenthesis = $lastParenthesisStartConditionId;
$condition->parenthesis = array_pop($lastParenthesisStartConditionIds);
} else {
$condition->$field_name = $post_data[$key . $field_name][$i];
}
@ -149,8 +149,8 @@ class AOR_Condition extends Basic
}
$condition->aor_report_id = $parent->id;
$conditionId = $condition->save();
if ($condition->parenthesis == 'START') {
$lastParenthesisStartConditionId = $conditionId;
if ($condition->parenthesis === 'START') {
$lastParenthesisStartConditionIds[] = $conditionId;
}
}
}