diff --git a/db/update16.2.sql b/db/update16.2.sql index 19f0199beb..b83636466a 100644 --- a/db/update16.2.sql +++ b/db/update16.2.sql @@ -1,7 +1,7 @@ ALTER TABLE `zt_kanbanspace` ADD `type` varchar(50) NOT NULL AFTER `name`; -UPDATE `zt_kanbanspace` SET `type` = 'cooperation'; +UPDATE `zt_kanbanspace` SET `type` = 'cooperation', `whitelist` = ''; -ALTER TABLE `zt_kanban` ADD `importObject` varchar(255) NOT NULL AFTER `displayCards`; +ALTER TABLE `zt_kanban` ADD `object` 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`; @@ -9,4 +9,4 @@ ALTER TABLE `zt_kanbancard` ADD `fromID` mediumint(8) unsigned NOT NULL AFTER `g ALTER TABLE `zt_kanbancard` ADD `fromType` varchar(30) NOT NULL AFTER `fromID`; ALTER TABLE `zt_job` ADD `sonarqubeServer` mediumint(8) unsigned NOT NULL AFTER `triggerType`; -ALTER TABLE `zt_job` ADD `projectKey` varchar(255) NOT NULL AFTER `sonarqubeServer`; +ALTER TABLE `zt_job` ADD `projectKey` varchar(255) NOT NULL AFTER `sonarqubeServer`; \ No newline at end of file diff --git a/db/zentao.sql b/db/zentao.sql index 5e35e0e364..9fcaf3a999 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -679,6 +679,7 @@ CREATE TABLE `zt_kanban` ( `status` enum('active','closed') NOT NULL default 'active', `order` mediumint(8) NOT NULL DEFAULT '0', `displayCards` smallint(6) NOT NULL default '0', + `object` varchar(255) NOT NULL, `createdBy` char(30) NOT NULL, `createdDate` datetime NOT NULL, `lastEditedBy` char(30) NOT NULL, diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 7c755ebe50..fc2d284de4 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -632,7 +632,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 de29283f07..8958d859e8 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -632,7 +632,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 67ca809d04..f379663975 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1301,6 +1301,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/automation/css/browse.en.css b/module/automation/css/browse.en.css index 99d720b04c..932989f227 100644 --- a/module/automation/css/browse.en.css +++ b/module/automation/css/browse.en.css @@ -3,7 +3,16 @@ .ztf-logo {width: 30%;} .zendata-logo { width: 30%;} -.block-zendata {height:230px;} +.block-zendata {height:230px; padding: 30px 14px;} +.block-details {padding: 30px 60px;} +.block-details li {width: 50%;} +.block-details-line li {width: 100%;} + +.zendata-download {width: 68%;} +.ztf-download {width: 58%;} +.ztf-download-trait {margin: 35px 0 6px 0;} +.ztf-download-trait div {width: 47%;} +.qr-code {padding: 20px 0 20px 32px;} @media screen and (max-height: 768px) { 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;?>