Merge branch 'sprint/devops16_liyuchun_45491' into 'master'

* Finish task #45491.

See merge request easycorp/zentaopms!803

(cherry picked from commit ff06288dc8)

b11dd3af  * Finish task #45491.
This commit is contained in:
王怡栋
2021-12-07 08:49:16 +00:00
committed by 李玉春
parent 3d1d34e383
commit cf280763b2
14 changed files with 162 additions and 9 deletions
+2 -1
View File
@@ -15,7 +15,8 @@
if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = '';
$class = $action->major ? "class='active'" : '';
echo "<li $class><div>";
printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName, $action->objectName);
if($action->objectLink) printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName, $action->objectName);
if(!$action->objectLink) printf($lang->block->noLinkDynamic, $action->date, $action->objectName, $user, $action->actionLabel, $action->objectLabel, $action->objectName);
echo "</div></li>";
$i++;
}