SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-09-12 23:23:49 +08:00
Code Issues Projects Packages Activity Actions

Merge next into suite 8

Browse source 
Merge commit 'de4bf25cb3' into release/8.4.0-beta

# Conflicts:
#	public/legacy/data/SugarBean.php
#	public/legacy/include/Smarty/plugins/function.sugarvar.php
#	public/legacy/include/SugarDateTime.php
#	public/legacy/include/database/MysqliManager.php
#	public/legacy/modules/Alerts/metadata/listviewdefs.php
#	public/legacy/modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php
#	public/legacy/modules/Trackers/metadata/SearchFields.php
#	public/legacy/modules/Trackers/metadata/listviewdefs.php
#	public/legacy/modules/UpgradeWizard/SugarMerge/EditViewMerge.php
#	public/legacy/suitecrm_version.php
This commit is contained in:
Clemente Raposo 2023-07-21 15:22:52 +01:00
commit 5aa0daf046
1656 changed files with 8616 additions and 6081 deletions
Download patch file Download diff file Expand all files Collapse all files

3
public/legacy/modules/ACLActions/ACLAction.php
View file

@ -51,6 +51,7 @@ if (file_exists(__DIR__ . '/../../modules/ACLActions/actiondefs.override.php'))

/* END - SECURITY GROUPS */

#[\AllowDynamicProperties]
class ACLAction extends SugarBean
{
public $module_dir = 'ACLActions';
@ -204,7 +205,7 @@ class ACLAction extends SugarBean
{
global $ACLActionAccessLevels;
if (isset($ACLActionAccessLevels[$access])) {
$label = preg_replace('/(LBL_ACCESS_)(.*)/', '$2', $ACLActionAccessLevels[$access]['label']);
$label = preg_replace('/(LBL_ACCESS_)(.*)/', '$2', (string) $ACLActionAccessLevels[$access]['label']);

return strtolower($label);
}

12
public/legacy/modules/ACLActions/actiondefs.override.php
View file

@ -89,14 +89,14 @@ $GLOBALS['ACLActions'] = array(
'label'=>'LBL_ACTION_ACCESS',
'default'=>ACL_ALLOW_ENABLED,
),

'view'=>
array(
'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
'label'=>'LBL_ACTION_VIEW',
'default'=>ACL_ALLOW_ALL,
),

'list'=>
array(
'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
@ -108,14 +108,14 @@ $GLOBALS['ACLActions'] = array(
'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
'label'=>'LBL_ACTION_EDIT',
'default'=>ACL_ALLOW_ALL,

),
'delete'=>
array(
'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
'label'=>'LBL_ACTION_DELETE',
'default'=>ACL_ALLOW_ALL,

),
'import'=>
array(
@ -135,8 +135,8 @@ $GLOBALS['ACLActions'] = array(
'label'=>'LBL_ACTION_MASSUPDATE',
'default'=>ACL_ALLOW_ALL,
),


),),
);
/* END - SECURITY GROUPS */