diff --git a/module/action/control.php b/module/action/control.php index 971a251e50..08dc85bf7a 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -143,6 +143,22 @@ class action extends control foreach($trashes as $trash) $executionIdList[] = $trash->execution; $this->view->executionList = $this->execution->getByIdList($executionIdList, 'all'); } + + /* Process pivot name. */ + foreach($trashes as $trash) + { + if($trash->objectType == 'pivot') + { + $pivotNames = json_decode($trash->objectName, true); + $trash->objectName = zget($pivotNames, $this->app->getClientLang(), ''); + if(empty($trash->objectName)) + { + $pivotNames = array_filter($pivotNames); + $trash->objectName = reset($pivotNames); + } + } + } + /* Title and position. */ $this->view->title = $this->lang->action->trash; $this->view->position[] = $this->lang->action->trash; diff --git a/module/action/lang/de.php b/module/action/lang/de.php index 9c78f6e716..61a8cc5224 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -269,6 +269,14 @@ $lang->action->desc->linkbug = '$date, $actor link bugs action->desc->unlinkstory = '$date, $actor remove stories $extra from plan.' . "\n"; $lang->action->desc->unlinkbug = '$date, $actor remove bugs $extra from plan.' . "\n"; +/* Describes the history of operations when a document is saved as a draft or released. */ +$lang->action->desc->saveddraft = '$date, 由 $actor save draft $extra。' . "\n"; +$lang->action->desc->releaseddoc = '$date, 由 $actor released $extra。' . "\n"; + +/* This parameter describes historical operations that are performed when a document is collected or uncollected. */ +$lang->action->desc->collected = '$date, 由 $actor collected $extra。' . "\n"; +$lang->action->desc->uncollected = '$date, 由 $actor uncollected $extra。' . "\n"; + /* Used to display dynamic information. */ $lang->action->label = new stdclass(); $lang->action->label->install = 'install '; @@ -428,6 +436,10 @@ $lang->action->label->createdsnapshot = 'create snapshot'; $lang->action->label->restoredsnapshot = 'create snapshot'; $lang->action->label->editsnapshot = 'edit snapshot'; $lang->action->label->deletesnapshot = 'deleted snapshot'; +$lang->action->label->saveddraft = 'save draft'; +$lang->action->label->releaseddoc = 'released'; +$lang->action->label->collected = 'collected'; +$lang->action->label->uncollected = 'uncollected'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 11a1112438..d874c37d33 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -269,6 +269,14 @@ $lang->action->desc->linkbug = '$date, $actor link bugs action->desc->unlinkstory = '$date, $actor remove stories $extra from plan.' . "\n"; $lang->action->desc->unlinkbug = '$date, $actor remove bugs $extra from plan.' . "\n"; +/* Describes the history of operations when a document is saved as a draft or released. */ +$lang->action->desc->saveddraft = '$date, 由 $actor save draft $extra。' . "\n"; +$lang->action->desc->releaseddoc = '$date, 由 $actor released $extra。' . "\n"; + +/* This parameter describes historical operations that are performed when a document is collected or uncollected. */ +$lang->action->desc->collected = '$date, 由 $actor collected $extra。' . "\n"; +$lang->action->desc->uncollected = '$date, 由 $actor uncollected $extra。' . "\n"; + /* Used to display dynamic information. */ $lang->action->label = new stdclass(); $lang->action->label->install = 'install '; @@ -428,6 +436,10 @@ $lang->action->label->createdsnapshot = 'create snapshot'; $lang->action->label->restoredsnapshot = 'create snapshot'; $lang->action->label->editsnapshot = 'edit snapshot'; $lang->action->label->deletesnapshot = 'deleted snapshot'; +$lang->action->label->saveddraft = 'save draft'; +$lang->action->label->releaseddoc = 'released'; +$lang->action->label->collected = 'collected'; +$lang->action->label->uncollected = 'uncollected'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 9b83041321..039c6e8c98 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -269,6 +269,14 @@ $lang->action->desc->linkbug = '$date, $actor link bugs action->desc->unlinkstory = '$date, $actor remove stories $extra from plan.' . "\n"; $lang->action->desc->unlinkbug = '$date, $actor remove bugs $extra from plan.' . "\n"; +/* Describes the history of operations when a document is saved as a draft or released. */ +$lang->action->desc->saveddraft = '$date, 由 $actor save draft $extra。' . "\n"; +$lang->action->desc->releaseddoc = '$date, 由 $actor released $extra。' . "\n"; + +/* This parameter describes historical operations that are performed when a document is collected or uncollected. */ +$lang->action->desc->collected = '$date, 由 $actor collected $extra。' . "\n"; +$lang->action->desc->uncollected = '$date, 由 $actor uncollected $extra。' . "\n"; + /* Used to display dynamic information. */ $lang->action->label = new stdclass(); $lang->action->label->install = 'install '; @@ -428,6 +436,10 @@ $lang->action->label->createdsnapshot = 'create snapshot'; $lang->action->label->restoredsnapshot = 'create snapshot'; $lang->action->label->editsnapshot = 'edit snapshot'; $lang->action->label->deletesnapshot = 'deleted snapshot'; +$lang->action->label->saveddraft = 'save draft'; +$lang->action->label->releaseddoc = 'released'; +$lang->action->label->collected = 'collected'; +$lang->action->label->uncollected = 'uncollected'; /* Dynamic information is grouped by object. */ $lang->action->dynamicAction = new stdclass(); diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index cda9c316ed..e51737090a 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -269,6 +269,14 @@ $lang->action->desc->linkbug = '$date, 由 $actor 关联BUG $lang->action->desc->unlinkstory = '$date, 由 $actor 从计划移除需求 $extra。' . "\n"; $lang->action->desc->unlinkbug = '$date, 由 $actor 从计划移除BUG $extra。' . "\n"; +/* 用来描述文档保存为草稿或发布时的历史操作记录。*/ +$lang->action->desc->saveddraft = '$date, 由 $actor 存为草稿 $extra。' . "\n"; +$lang->action->desc->releaseddoc = '$date, 由 $actor 发布 $extra。' . "\n"; + +/* 用来描述文档收藏或取消收藏时的历史操作记录。*/ +$lang->action->desc->collected = '$date, 由 $actor 收藏 $extra。' . "\n"; +$lang->action->desc->uncollected = '$date, 由 $actor 取消收藏 $extra。' . "\n"; + /* 用来显示动态信息。*/ $lang->action->label = new stdclass(); $lang->action->label->install = '安装了'; @@ -428,6 +436,10 @@ $lang->action->label->createdsnapshot = '创建了快照'; $lang->action->label->restoredsnapshot = '还原了快照'; $lang->action->label->editsnapshot = '编辑了快照'; $lang->action->label->deletesnapshot = '编辑了快照'; +$lang->action->label->saveddraft = '存为草稿'; +$lang->action->label->releaseddoc = '发布了'; +$lang->action->label->collected = '收藏了'; +$lang->action->label->uncollected = '取消收藏了'; /* 动态信息按照对象分组 */ $lang->action->dynamicAction = new stdclass(); diff --git a/module/action/model.php b/module/action/model.php index c51bcb6852..cc3f9d8f59 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1352,6 +1352,16 @@ class actionModel extends model { $action->objectName = $action->extra; } + elseif($action->objectType == 'pivot') + { + $pivotNames = json_decode($action->objectName, true); + $action->objectName = zget($pivotNames, $this->app->getClientLang(), ''); + if(empty($action->objectName)) + { + $pivotNames = array_filter($pivotNames); + $action->objectName = reset($pivotNames); + } + } $projectID = isset($relatedProjects[$action->objectType][$action->objectID]) ? $relatedProjects[$action->objectType][$action->objectID] : 0; diff --git a/module/block/control.php b/module/block/control.php index e1438b6578..eb5720644a 100755 --- a/module/block/control.php +++ b/module/block/control.php @@ -2053,6 +2053,12 @@ class block extends control */ public function printDocDynamicBlock() { + /* Load pager. */ + $this->app->loadClass('pager', $static = true); + $pager = new pager(0, 30, 1); + + $this->view->actions = $this->loadModel('doc')->getDynamic($pager); + $this->view->users = $this->loadModel('user')->getPairs('nodeleted|noletter|all'); } /** diff --git a/module/block/view/docdynamicblock.html.php b/module/block/view/docdynamicblock.html.php index e69de29bb2..d3a2c6a51d 100644 --- a/module/block/view/docdynamicblock.html.php +++ b/module/block/view/docdynamicblock.html.php @@ -0,0 +1,36 @@ + +
block->emptyTip;?>
+ + +
+
    + actor); + $class = in_array($action->action, array('releaseddoc', 'collected')) ? "active {$action->action}" : ''; + echo "
  • "; + 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 "
    • "; + $i++; + } + ?> +
+
+ diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php index 46466a6ce6..4a936125a4 100644 --- a/module/block/view/dynamic.html.php +++ b/module/block/view/dynamic.html.php @@ -2,7 +2,7 @@
block->emptyTip;?>