Skip to content

Commit

Permalink
* [bug#55422,done,0.2h,0h] Fix actions title empty error.
Browse files Browse the repository at this point in the history
  • Loading branch information
wangyuting authored and fireware committed Sep 14, 2024
1 parent 09a3483 commit 7fb163e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions framework/helper.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ function initTableData(array $items, array &$fieldList, object $model = null, st
}
}

global $app;
global $app, $lang;
if(empty($model))
{
$module = $app->getModuleName();
Expand Down Expand Up @@ -612,7 +612,11 @@ function initTableData(array $items, array &$fieldList, object $model = null, st
if(count($item->actions) > $maxActionCount) $maxActionCount = count($item->actions);
}

if(isset($fieldList['actions'])) $fieldList['actions']['minWidth'] = $maxActionCount * 24 + 24;
if(isset($fieldList['actions']))
{
$fieldList['actions']['minWidth'] = $maxActionCount * 24 + 24;
if(empty($fieldList['actions']['title'])) $fieldList['actions']['title'] = $lang->actions;
}
if($fieldList['actions']['minWidth'] < 48) $fieldList['actions']['minWidth'] = 48;

return array_values($items);
Expand Down

0 comments on commit 7fb163e

Please sign in to comment.