diff --git a/db/update15.0.sql b/db/update15.0.sql index b4383bdb2d..6b30c72d42 100644 --- a/db/update15.0.sql +++ b/db/update15.0.sql @@ -40,6 +40,7 @@ ALTER TABLE `zt_webhook` CHANGE `projects` `executions` mediumint(8) unsigned NO ALTER TABLE `zt_task` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_doclib` ADD `project` mediumint(8) unsigned NOT NULL AFTER `product`; ALTER TABLE `zt_doc` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; +ALTER TABLE `zt_story` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_bug` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_case` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_testtask` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; @@ -345,3 +346,5 @@ update zt_block set source='execution' where block='statistic' and source='proje update zt_block set source='project' where block='statistic' and source='program'; update zt_config set `value`='project-browse' where `key`='projectLink'; update zt_config set `value`='program-browse' where `key`='programLink'; +update zt_block set source='project', block='projectteam' where block='programteam' and source='program'; +update zt_block set source='project', block='project' where block='program' and source='program'; diff --git a/module/block/view/issueblock.html.php b/module/block/view/issueblock.html.php index 4a558146ea..137e131af0 100644 --- a/module/block/view/issueblock.html.php +++ b/module/block/view/issueblock.html.php @@ -30,7 +30,7 @@ ?> id);?> - createLink('issue', 'view', "issueID=$issue->id", '', '', $issue->PRJ), $issue->title)?> + createLink('issue', 'view', "issueID=$issue->id", '', '', $issue->project), $issue->title)?> issue->priList, $issue->pri)?> issue->severityList, $issue->severity)?> diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php index e21038f0ad..b7e084b4e0 100644 --- a/module/block/view/recentprojectblock.html.php +++ b/module/block/view/recentprojectblock.html.php @@ -49,14 +49,14 @@
    • diff --git a/module/block/view/riskblock.html.php b/module/block/view/riskblock.html.php index 3f0cbcc58a..8d8610711b 100644 --- a/module/block/view/riskblock.html.php +++ b/module/block/view/riskblock.html.php @@ -33,7 +33,7 @@ ?> id);?> - createLink('risk', 'view', "riskID=$risk->id", '', '', $risk->PRJ), $risk->name)?> + createLink('risk', 'view', "riskID=$risk->id", '', '', $risk->project), $risk->name)?> pri}'>" . zget($lang->risk->priList, $risk->pri) . "";?> risk->categoryList, $risk->category)?> diff --git a/module/block/view/scrumoverviewblock.html.php b/module/block/view/scrumoverviewblock.html.php index 463859cfb8..5c8e2a704e 100644 --- a/module/block/view/scrumoverviewblock.html.php +++ b/module/block/view/scrumoverviewblock.html.php @@ -32,7 +32,7 @@
    block->totalPeople;?>
    - teamCount ? html::a($this->createLink('program', 'prjmanageMembers', 'projectID=' . $projectID), $totalData[$projectID]->teamCount) : 0;?> + teamCount ? html::a($this->createLink('project', 'manageMembers', 'projectID=' . $projectID), $totalData[$projectID]->teamCount) : 0;?>
    diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index c6f709686b..cc93fc7d17 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -133,6 +133,7 @@ list($executionModule, $executionMethod) = explode('-', $config->executionLink); /* 主导航菜单。*/ $lang->mainNav = new stdclass(); $lang->mainNav->my = ' 地盘|my|index|'; +if($config->systemMode == 'new') $lang->mainNav->program = " 项目集|$programModule|$programMethod|"; $lang->mainNav->product = " 产品|$productModule|$productMethod|"; if($config->systemMode == 'new') { @@ -149,7 +150,6 @@ $lang->mainNav->doc = ' 文档|doc|index|'; $lang->mainNav->report = " 统计|report|productSummary|"; $lang->mainNav->system = ' 组织|my|team|'; $lang->mainNav->admin = ' 后台|admin|index|'; -if($config->systemMode == 'new') $lang->mainNav->program = " 项目集|$programModule|$programMethod|"; $lang->dividerMenu = ',qa,report,admin,'; diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php index eabaedbeea..6b2f91053e 100644 --- a/module/doc/view/showfiles.html.php +++ b/module/doc/view/showfiles.html.php @@ -74,11 +74,11 @@ objectType, array('task', 'build'))) { - $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->PRJ); + $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->project); } if($type == 'product' && in_array($file->objectType, array('bug', 'release', 'testcase', 'testreport'))) { - $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->PRJ); + $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->project); } else { @@ -151,7 +151,7 @@ objectType, array('task', 'build'))) { - $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->PRJ); + $objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->project); } else { diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php index 54c2f587b0..3c90899db2 100644 --- a/module/group/view/manageview.html.php +++ b/module/group/view/manageview.html.php @@ -127,14 +127,12 @@
    - - - + diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index bcbfc19731..c5b3eccd73 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -48,7 +48,7 @@