lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Override Attribute

Browse Source
This commit is contained in:
ATM john 2019-06-13 22:11:47 +02:00
parent 0ef9a8843a
commit e7d81a68f0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/lib/functions.lib.php
View File

@ -8130,9 +8130,17 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
// Override attr // Override attr
if(!empty($params['attr']) && is_array($params['attr'])){ if(!empty($params['attr']) && is_array($params['attr'])){
foreach($params['attr'] as $key => $value){ foreach($params['attr'] as $key => $value){
if($key == 'class'){
$attr['class'].= ' '.$value;
}
elseif($key == 'classOverride'){
$attr['class'] = $value;
}
else{
$attr[$key] = $value; $attr[$key] = $value;
} }
} }
}
if(isset($attr['href']) && empty($attr['href'])){ if(isset($attr['href']) && empty($attr['href'])){
unset($attr['href']); unset($attr['href']);
@ -8202,10 +8210,10 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
$attr['href'] = ''; $attr['href'] = '';
if($status == -1){ // Not enough permissions if($status == -1){ // disable
$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled")); $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
} }
elseif($status == 0){ // disable elseif($status == 0){ // Not enough permissions
$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")); $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
} }
} }