diff --git a/module/task/control.php b/module/task/control.php
index 2161dc0b99..b0bd27fb45 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -206,7 +206,7 @@ class task extends control
$this->view->title = $title;
$this->view->position = $position;
$this->view->project = $project;
- $this->view->projects = $this->config->systemMode == 'old' ? $projects : $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
+ $this->view->projects = $this->config->systemMode == 'classic' ? $projects : $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
$this->view->task = $task;
$this->view->users = $users;
$this->view->stories = $stories;
@@ -392,7 +392,7 @@ class task extends control
$this->view->users = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}");
$this->view->showAllModule = isset($this->config->project->task->allModule) ? $this->config->project->task->allModule : '';
$this->view->modules = $this->tree->getTaskOptionMenu($this->view->task->project, 0, 0, $this->view->showAllModule ? 'allModule' : '');
- $this->view->projects = $this->config->systemMode == 'old' ? $this->project->getExecutionPairs() : $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
+ $this->view->projects = $this->config->systemMode == 'classic' ? $this->project->getExecutionPairs() : $this->loadModel('project')->getExecutionsByProject($this->session->PRJ, 'all', 0, true);
$this->display();
}
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 2b0b5ae9cb..264757b558 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1217,10 +1217,10 @@ class testtask extends control
}
/**
- * Ajax get test tasks
- *
- * @param int $productID
- * @param int $projectID
+ * Ajax get test tasks.
+ *
+ * @param int $productID
+ * @param int $projectID
* @access public
* @return void
*/
diff --git a/module/tree/js/browse.js b/module/tree/js/browse.js
index 5738cfee20..2661c9b8ab 100644
--- a/module/tree/js/browse.js
+++ b/module/tree/js/browse.js
@@ -63,15 +63,13 @@ function syncProductOrProject(obj, type)
$('#copyModule').bind('click', function(){syncModule(obj.value, viewType)});
}
-function toggleCopy()
+function toggleCopy(toggle)
{
- var $copy = $('.table-row.copy');
- if($copy.size() == 0) return false;
- $copy.toggle();
+ $('.table-row.copy').toggle(toggle);
}
$(document).ready(function()
{
- toggleCopy();
+ toggleCopy(false);
$('[data-id="edit"] a').modalTrigger({type: 'iframe', width: 500});
});
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 7746f937ea..d69ea8c7b3 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -104,7 +104,7 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete]{display:none;}
-
+
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 4ad3208cf2..945f9643d5 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -73,11 +73,11 @@ $lang->upgrade->mergeProgramDesc = << 可以选择这些迭代归属于某个新项目下。
EOD;
-$lang->upgrade->to15Mode['old'] = '保持老版本的习惯';
-$lang->upgrade->to15Mode['new'] = '全新项目集管理模式';
+$lang->upgrade->to15Mode['classic'] = '保持老版本的习惯';
+$lang->upgrade->to15Mode['new'] = '全新项目集管理模式';
-$lang->upgrade->selectedModeTips['old'] = '后续您还可以在后台-自定义里面切换为全新项目集管理的模式。';
-$lang->upgrade->selectedModeTips['new'] = '切换为项目集管理模式需要对之前的数据进行归并处理，系统会引导您完成这个操作。';
+$lang->upgrade->selectedModeTips['classic'] = '后续您还可以在后台-自定义里面切换为全新项目集管理的模式。';
+$lang->upgrade->selectedModeTips['new'] = '切换为项目集管理模式需要对之前的数据进行归并处理，系统会引导您完成这个操作。';
$lang->upgrade->line = '产品线';
$lang->upgrade->program = '目标项目集和项目';
diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php
index 03d2ef6c21..c2a12b312f 100644
--- a/module/upgrade/view/to15guide.html.php
+++ b/module/upgrade/view/to15guide.html.php
@@ -18,8 +18,8 @@
upgrade->to15Desc;?>
- upgrade->to15Mode, 'old');?>
- upgrade->selectedModeTips['old'];?>
+ upgrade->to15Mode, 'classic');?>
+ upgrade->selectedModeTips['classic'];?>
diff --git a/module/user/model.php b/module/user/model.php
index 1091a48d9a..90144f7878 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1548,7 +1548,7 @@ class userModel extends model
if($allProducts === null) $allProducts = $this->dao->select('id,PO,QD,RD,createdBy,acl,whitelist,program,createdBy')->from(TABLE_PRODUCT)->where('acl')->ne('open')->fetchAll('id');
if($allProjects === null) $allProjects = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,parent,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('project')->fetchAll('id');
if($allPrograms === null) $allPrograms = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('program')->fetchAll('id');
- if($allSprints === null) $allSprints = $this->dao->select('id,PO,PM,QD,RD,acl,project,path,parent,type,openedBy')->from(TABLE_PROJECT)->where('acl')->eq('private')->andWhere('type')->in('sprint,stage')->fetchAll('id');
+ if($allSprints === null) $allSprints = $this->dao->select('id,PO,PM,QD,RD,acl,project,path,parent,type,openedBy')->from(TABLE_PROJECT)->where('acl')->eq('private')->beginIF($this->config->systemMode == 'new')->andWhere('type')->in('sprint,stage')->fi()->fetchAll('id');
/* Get teams. */
if($teams === null)
@@ -1777,9 +1777,8 @@ class userModel extends model
/* Set opened sprints and stages into userview. */
$openedSprints = $this->dao->select('id')->from(TABLE_PROJECT)
->where('acl')->eq('open')
- ->andWhere('type')
- ->in('sprint,stage')
- ->andWhere('project')->in($userView->projects)
+ ->beginIF($this->config->systemMode == 'new')->andWhere('type')->in('sprint,stage')->fi()
+ ->beginIF($this->config->systemMode == 'new')->andWhere('project')->in($userView->projects)->fi()
->fetchAll('id');
$openedSprints = join(',', array_keys($openedSprints));
|