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

Squashed 'public/legacy/' changes from b065977c61..5750e66a06

Browse source 
5750e66a06 SuiteCRM 7.12.6 Release
d80ca53e48 Update jquery UI to v1.13.1
cacf7aa247 Upgrade jstree to v3.3.12
2c95a4c083 Update Wysiwyg field to work with the new version of TinyMCE
9c487fa43c Update email/template views to work with new versions of TinyMCE
7bcbf2a737 Upgrade TinyMCE to version 5.10
63b89fbd4f Fix #9494 - Force displaying line breaks to textarea fields
63dc9adf21 Fix #9530 - Fatal error on rendering page after upload
59d0b42cf0 Fix Module Builder Acceptance Tests
29f18cf248 Fix AOR_Report unit tests
ccbb40ca4a Fix scrm-core#87 - Prevent disabling the default lang
4c83fe64a3 Fix #9437 - Use application setCookie across the app
b293490c65 Fix #9437 - Change cookie_path handling
4e8924e549 Fix #3157 - Add default option to enable session_gc
120e948307 Fix #9438 - Adding Action keyword to fieldname exception
e037232900 Fix #8599 - Auto-close message boxes in ModuleBuilder
277d40b61a Fix #9435 - Dropdown doesn't return empty selected value

git-subtree-dir: public/legacy
git-subtree-split: 5750e66a060310494cc12b074062ffd36658bc1e
This commit is contained in:
Clemente Raposo 2022-05-17 18:37:50 +01:00
parent 5fa70e2794
commit 804972c3f6
140 changed files with 1361 additions and 29649 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/AOW_WorkFlow/aow_utils.php
View file

@ -523,8 +523,7 @@ function getModuleField(
// fill in enums
if (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']])) {
$fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
}
// Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
} // Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
elseif (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']])) {
$fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
}
@ -533,6 +532,12 @@ function getModuleField(
if (isset($fieldlist[$name]['options']) && is_array($fieldlist[$name]['options']) && !isset($fieldlist[$name]['options'][''])) {
$fieldlist[$name]['options'][''] = '';
}
if ($fieldlist[$name]['type'] == 'enum' || $fieldlist[$name]['type'] == 'multienum' || $fieldlist[$name]['type'] == 'dynamicenum') {
if ($params['value_set'] === true && $value === "") {
$fieldlist[$name]['default'] = $value;
}
}
}
// fill in function return values

8
modules/AOW_WorkFlow/controller.php
View file

@ -328,6 +328,12 @@ class AOW_WorkFlowController extends SugarController
$value = '';
}
if ($_REQUEST['is_value_set'] === 'false'){
$params['value_set'] = false;
} else{
$params['value_set'] = true;
}
switch ($_REQUEST['aow_type']) {
case 'Field':
if (isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
@ -354,7 +360,7 @@ class AOW_WorkFlowController extends SugarController
// no break
case 'Value':
default:
echo getModuleField($rel_module, $fieldname, $aow_field, $view, $value);
echo getModuleField($rel_module, $fieldname, $aow_field, $view, $value, '', '', $params);
break;
}
die;