diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php
index 7829dff885..f23e7b4c79 100644
--- a/module/block/view/projectblock.html.php
+++ b/module/block/view/projectblock.html.php
@@ -13,7 +13,7 @@
project->PM;?> |
project->status;?> |
- project->teamCount;?> |
+ project->teamCount;?> |
task->consumed;?> |
project->budget;?> |
project->leftStories;?> |
diff --git a/module/execution/model.php b/module/execution/model.php
index c0a086a0ae..afa7a7ac6c 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -145,7 +145,6 @@ class executionModel extends model
if($this->config->systemMode == 'classic')
{
- $this->session->set('moreExecutionLink', $this->app->getURI(true));
$output = "";
@@ -841,8 +840,6 @@ class executionModel extends model
{
if(in_array($currentMethod, array('index', 'all', 'batchedit'))) return;
- $this->session->set('moreExecutionLink', $this->app->getURI(true));
-
$currentExecutionName = $this->lang->execution->common;
if($executionID)
{
@@ -1325,8 +1322,6 @@ class executionModel extends model
if(($this->session->taskBrowseType) and ($this->session->taskBrowseType != 'bysearch')) $browseType = $this->session->taskBrowseType;
}
- $this->session->set('taskWithChildren', in_array($browseType, array('unclosed', 'byexecution', 'all', 'bysearch')) ? false : true);
-
/* Get tasks. */
$tasks = array();
if($browseType != "bysearch")
@@ -1369,8 +1364,6 @@ class executionModel extends model
$taskQuery = str_replace("`execution` = 'all'", $executionQuery, $taskQuery); // Search all execution.
$this->session->set('taskQueryCondition', $taskQuery);
$this->session->set('taskOnlyCondition', true);
- $this->session->set('taskOrderBy', $sort);
- $this->session->set('taskBrowseList', array());
$tasks = $this->getSearchTasks($taskQuery, $pager, $sort);
}
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 6167c29249..2d9542ced5 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -60,9 +60,8 @@ $lang->project->code = '项目代号';
$lang->project->copy = '复制项目';
$lang->project->begin = '计划开始';
$lang->project->end = '计划完成';
-$lang->project->status = '项目状态';
-$lang->project->PM = '项目负责人';
-$lang->project->budget = '项目预算';
+$lang->project->status = '状态';
+$lang->project->budget = '预算';
$lang->project->template = '项目模板';
$lang->project->estimate = '预计';
$lang->project->consume = '消耗';
@@ -81,7 +80,6 @@ $lang->project->acl = '访问控制';
$lang->project->setPlanduration = '设置工期';
$lang->project->auth = '权限控制';
$lang->project->durationEstimation = '工作量估算';
-$lang->project->teamCount = '人数';
$lang->project->leftStories = '剩余需求';
$lang->project->leftTasks = '剩余任务';
$lang->project->leftBugs = '剩余Bug';
@@ -97,7 +95,7 @@ $lang->project->ev = 'EV';
$lang->project->sv = 'SV%';
$lang->project->ac = 'AC';
$lang->project->cv = 'CV%';
-$lang->project->teamCount = '项目成员';
+$lang->project->teamCount = '成员';
$lang->project->longTime = '长期';
$lang->project->future = '待定';
$lang->project->moreProject = '更多项目';