diff --git a/db/update16.2.sql b/db/update16.2.sql index 391d35bf3e..1939846fa6 100644 --- a/db/update16.2.sql +++ b/db/update16.2.sql @@ -3,6 +3,7 @@ UPDATE `zt_kanbanspace` SET `type` = 'cooperation'; ALTER TABLE `zt_kanban` ADD `importObject` varchar(255) NOT NULL AFTER `displayCards`; ALTER TABLE `zt_kanban` ADD `performable` enum ('0', '1') NOT NULL DEFAULT '0' AFTER `archived`; +ALTER TABLE `zt_kanbancard` ADD `status` varchar(30) NOT NULL AFTER `name`; ALTER TABLE `zt_kanbancard` ADD `fromID` int(8) NOT NULL AFTER `group`; ALTER TABLE `zt_kanbancard` ADD `fromType` varchar(50) NOT NULL AFTER `fromID`; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index bde1c19b3d..4c1e7b54e7 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -622,7 +622,7 @@ $lang->action->label->issue = 'Issue|issue|view|issueID=%s'; $lang->action->label->design = 'Design|design|view|designID=%s'; $lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s'; $lang->action->label->api = 'Interface|api|index|libID=%s&moduleID=%s&apiID=%s'; -$lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=all'; +$lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=%s'; $lang->action->label->kanbanregion = 'Kanban Region|kanban|view|kanbanID=%s'; $lang->action->label->kanban = 'Kanban|kanban|view|kanbanID=%s'; $lang->action->label->kanbancolumn = 'Kanban Column|execution|kanban|execution=%s'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 98679d3045..4442e8c448 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -622,7 +622,7 @@ $lang->action->label->issue = '问题|issue|view|issueID=%s'; $lang->action->label->design = '设计|design|view|designID=%s'; $lang->action->label->stakeholder = '干系人|stakeholder|view|userID=%s'; $lang->action->label->api = '接口|api|index|libID=%s&moduleID=%s&apiID=%s'; -$lang->action->label->kanbanspace = '看板空间|kanban|space|browseType=all'; +$lang->action->label->kanbanspace = '看板空间|kanban|space|browseType=%s'; $lang->action->label->kanbanregion = '看板区域|kanban|view|kanbanID=%s'; $lang->action->label->kanban = '看板|kanban|view|kanbanID=%s'; $lang->action->label->kanbancolumn = '看板列|execution|kanban|execution=%s'; diff --git a/module/action/model.php b/module/action/model.php index 5aaabd6619..594e839a21 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1289,6 +1289,11 @@ class actionModel extends model { $params = sprintf($vars, trim($action->product, ',')); } + elseif($action->objectType == 'kanbanspace') + { + $kanbanSpace = $this->dao->select('type')->from(TABLE_KANBANSPACE)->where('id')->eq($action->objectID)->fetch(); + $params = sprintf($vars, $kanbanSpace->type); + } elseif($action->objectType == 'kanbancolumn' or $action->objectType == 'kanbanlane') { $params = sprintf($vars, $action->extra); diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 28d45685d1..b0a9a555e3 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -106,25 +106,6 @@ $lang->block->spent = 'Has Been Spent'; $lang->block->budget = 'Budget'; $lang->block->left = 'Residuals'; -$lang->block->titleList['flowchart'] = 'Flowchart'; -$lang->block->titleList['statistic'] = 'Statistic'; -$lang->block->titleList['recentproject'] = 'Recent Project'; -$lang->block->titleList['assigntome'] = 'Assign To Me'; -$lang->block->titleList['projectteam'] = 'Project Team'; -$lang->block->titleList['project'] = 'Project'; -$lang->block->titleList['dynamic'] = 'Dynamic'; -$lang->block->titleList['list'] = 'List'; -$lang->block->titleList['contribute'] = 'Contribute'; -$lang->block->titleList['scrumoverview'] = 'Scrum Overview'; -$lang->block->titleList['scrumtest'] = 'Scrum Test'; -$lang->block->titleList['scrumlist'] = 'Scrum List'; -$lang->block->titleList['sprint'] = 'Sprint'; -$lang->block->titleList['projectdynamic'] = 'Project Dynamic'; -$lang->block->titleList['bug'] = 'Bug'; -$lang->block->titleList['case'] = 'Case'; -$lang->block->titleList['testtask'] = 'Testtask'; - - $lang->block->default['waterfall']['project']['3']['title'] = 'Plan Gantt Chart'; $lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; $lang->block->default['waterfall']['project']['3']['source'] = 'project'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 3ca65ef783..e5d8deface 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -106,25 +106,6 @@ $lang->block->spent = '已花费'; $lang->block->budget = '预算'; $lang->block->left = '剩余'; -$lang->block->titleList['flowchart'] = '流程图'; -$lang->block->titleList['statistic'] = '项目统计'; -$lang->block->titleList['recentproject'] = '我近期参与的项目'; -$lang->block->titleList['assigntome'] = '待处理'; -$lang->block->titleList['projectteam'] = '项目人力投入'; -$lang->block->titleList['project'] = '项目列表'; -$lang->block->titleList['dynamic'] = '最新动态'; -$lang->block->titleList['list'] = '我的待办'; -$lang->block->titleList['contribute'] = '我的贡献'; -$lang->block->titleList['scrumoverview'] = '项目概况'; -$lang->block->titleList['scrumtest'] = '待测版本'; -$lang->block->titleList['scrumlist'] = '迭代列表'; -$lang->block->titleList['sprint'] = '迭代总览'; -$lang->block->titleList['projectdynamic'] = '最新动态'; -$lang->block->titleList['bug'] = '指派给我的Bug'; -$lang->block->titleList['case'] = '指派给我的用例'; -$lang->block->titleList['testtask'] = '待测版本列表'; - - $lang->block->default['waterfall']['project']['3']['title'] = "项目计划"; $lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; $lang->block->default['waterfall']['project']['3']['source'] = 'project'; diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 4390aa91e2..ccca29da24 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -35,7 +35,7 @@ $useGuest = $this->app->user->account == 'guest'; block != 'welcome');?>
-
block->titleList, $block->block);?>
+
title;?>