diff --git a/module/story/control.php b/module/story/control.php
index 5d1f5964c3..59fd014da1 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -327,33 +327,36 @@ class story extends control
* @param int $branch
* @param int $moduleID
* @param int $storyID
- * @param int $project
+ * @param int $projectID
* @param int $plan
* @param string $type requirement|story
* @access public
* @return void
*/
- public function batchCreate($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $project = 0, $plan = 0, $type = 'story')
+ public function batchCreate($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $projectID = 0, $plan = 0, $type = 'story')
{
$this->lang->product->menu = $this->lang->product->viewMenu;
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
$this->lang->product->mainMenuAction = $this->product->getProductMainAction();
- if($project)
+ if($projectID)
{
- $prj = $this->dao->findById((int)$project)->from(TABLE_PROJECT)->fetch();
- if($prj->type == 'project')
+ $projects = $this->loadModel('project')->getExecutionPairs();
+ $this->project->setMenu($projects, $projectID);
+
+ $project = $this->dao->findById((int)$projectID)->from(TABLE_PROJECT)->fetch();
+ if($project->type == 'project')
{
$this->app->rawModule = 'projectstory';
$this->lang->navGroup->story = 'project';
- $this->lang->product->menu = $this->lang->menu->{$prj->model};
+ $this->lang->product->menu = $this->lang->menu->{$project->model};
}
else
{
$this->app->rawModule = 'project';
$this->lang->navGroup->story = 'project';
}
- $this->view->project = $prj;
+ $this->view->project = $project;
}
/* Clear title when switching products and set the session for the current product. */
@@ -378,12 +381,12 @@ class story extends control
foreach($mails as $mail) $stories[] = $mail->storyID;
/* Project or execution linked stories. */
- if($project)
+ if($projectID)
{
$products = array();
foreach($mails as $story) $products[$story->storyID] = $productID;
- $this->loadModel('project')->linkStory($project, $stories, $products);
- if($project != $this->session->PRJ) $this->loadModel('project')->linkStory($this->session->PRJ, $stories, $products);
+ $this->loadModel('project')->linkStory($projectID, $stories, $products);
+ if($projectID != $this->session->PRJ) $this->loadModel('project')->linkStory($this->session->PRJ, $stories, $products);
}
/* If storyID not equal zero, subdivide this story to child stories and close it. */
@@ -399,11 +402,11 @@ class story extends control
{
die(js::locate(inlink('view', "storyID=$storyID"), 'parent'));
}
- elseif($project)
+ elseif($projectID)
{
setcookie('storyModuleParam', 0, 0, $this->config->webRoot, '', false, false);
- $moduleName = $prj->type == 'project' ? 'projectstory' : 'project';
- $param = $prj->type == 'project' ? "productID=$productID" : "projectID=$project&orderBy=id_desc&browseType=unclosed";
+ $moduleName = $project->type == 'project' ? 'projectstory' : 'project';
+ $param = $project->type == 'project' ? "productID=$productID" : "projectID=$projectID&orderBy=id_desc&browseType=unclosed";
$link = $this->createLink($moduleName, 'story', $param);
die(js::locate($link, 'parent'));
}
@@ -494,7 +497,7 @@ class story extends control
$this->view->branch = $branch;
$this->view->branches = $this->loadModel('branch')->getPairs($productID);
/* When the user is product owner or add story in project or not set review, the default is not to review. */
- $this->view->needReview = ($this->app->user->account == $product->PO || $project > 0 || $this->config->story->needReview == 0) ? 0 : 1;
+ $this->view->needReview = ($this->app->user->account == $product->PO || $projectID > 0 || $this->config->story->needReview == 0) ? 0 : 1;
$this->display();
}
diff --git a/module/story/model.php b/module/story/model.php
index b92761810c..8c6bc48855 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3279,12 +3279,12 @@ class storyModel extends model
$canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlinkStory);
- $module = $this->app->rawModule == 'projectstory' ? 'projectstory' : 'story';
- $canView = common::hasPriv($module, 'view');
- $openModule = $this->app->rawModule == 'projectstory' ? 'project' : 'product';
- $storyLink = helper::createLink($module, 'view', "storyID=$story->id");
- $account = $this->app->user->account;
- $id = $col->id;
+ $module = $this->app->rawModule == 'projectstory' ? 'projectstory' : 'story';
+ $canView = common::hasPriv($module, 'view');
+ $openGroup = $this->app->rawModule == 'projectstory' ? 'project' : 'product';
+ $storyLink = helper::createLink($module, 'view', "storyID=$story->id");
+ $account = $this->app->user->account;
+ $id = $col->id;
if($col->show)
{
$class = "c-{$id}";
@@ -3347,7 +3347,7 @@ class storyModel extends model
case 'id':
if($canBatchAction)
{
- echo html::checkbox('storyIdList', array($story->id => '')) . html::a($storyLink, sprintf('%03d', $story->id), '', "data-group='$openModule'");
+ echo html::checkbox('storyIdList', array($story->id => '')) . html::a($storyLink, sprintf('%03d', $story->id), '', "data-group='$openGroup'");
}
else
{
@@ -3365,7 +3365,7 @@ class storyModel extends model
if($story->branch and isset($branches[$story->branch])) echo "
{$branches[$story->branch]} ";
if($story->module and isset($modulePairs[$story->module])) echo "
{$modulePairs[$story->module]} ";
if($story->parent > 0) echo '
' . $this->lang->story->childrenAB . ' ';
- echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color' data-group='$openModule'") : "
{$story->title}";
+ echo $canView ? html::a($storyLink, $story->title, '', "style='color: $story->color' data-group='$openGroup'") : "
{$story->title}";
if(!empty($story->children)) echo '
';
break;
case 'plan':
@@ -3649,12 +3649,15 @@ class storyModel extends model
$stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id);
$stories[$id]->bugs = $this->loadModel('bug')->getStoryBugs($id);
$stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id);
- $stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
- $stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
- ->where('AType')->eq('design')
- ->andWhere('BType')->eq('commit')
- ->andWhere('AID')->in(array_keys($stories[$id]->designs))
- ->fetchPairs();
+ if(isset($this->config->maxVersion))
+ {
+ $stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
+ $stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
+ ->where('AType')->eq('design')
+ ->andWhere('BType')->eq('commit')
+ ->andWhere('AID')->in(array_keys($stories[$id]->designs))
+ ->fetchPairs();
+ }
}
$requirement->track = $stories;
@@ -3680,12 +3683,15 @@ class storyModel extends model
$stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id);
$stories[$id]->bugs = $this->loadModel('bug')->getStoryBugs($id);
$stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id);
- $stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
- $stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
- ->where('AType')->eq('design')
- ->andWhere('BType')->eq('commit')
- ->andWhere('AID')->in(array_keys($stories[$id]->designs))
- ->fetchPairs();
+ if(isset($this->config->maxVersion))
+ {
+ $stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
+ $stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
+ ->where('AType')->eq('design')
+ ->andWhere('BType')->eq('commit')
+ ->andWhere('AID')->in(array_keys($stories[$id]->designs))
+ ->fetchPairs();
+ }
}
$requirements['noRequirement'] = $stories;
@@ -3711,12 +3717,16 @@ class storyModel extends model
foreach($stories as $id => $title)
{
$track[$id] = new stdclass();
- $track[$id]->title = $title;
- $track[$id]->case = $this->loadModel('testcase')->getStoryCases($id);
- $track[$id]->bug = $this->loadModel('bug')->getStoryBugs($id);
- $track[$id]->design = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
- $track[$id]->story = $this->getByID($id);
- $track[$id]->revision = $this->dao->select('BID, extra')->from(TABLE_RELATION)->where('AType')->eq('design')->andWhere('BType')->eq('commit')->andWhere('AID')->in(array_keys($track[$id]->design))->fetchPairs();
+ $track[$id]->title = $title;
+ $track[$id]->case = $this->loadModel('testcase')->getStoryCases($id);
+ $track[$id]->bug = $this->loadModel('bug')->getStoryBugs($id);
+ $track[$id]->story = $this->getByID($id);
+ $track[$id]->task = $this->loadModel('task')->getStoryTasks($id);
+ if(isset($this->config->maxVersion))
+ {
+ $track[$id]->design = $this->dao->select('id, name')->from(TABLE_DESIGN)->where('story')->eq($id)->fetchAll('id');
+ $track[$id]->revision = $this->dao->select('BID, extra')->from(TABLE_RELATION)->where('AType')->eq('design')->andWhere('BType')->eq('commit')->andWhere('AID')->in(array_keys($track[$id]->design))->fetchPairs();
+ }
}
return $track;
diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php
index f25ed35313..f58bb53ee4 100644
--- a/module/story/view/track.html.php
+++ b/module/story/view/track.html.php
@@ -44,7 +44,9 @@
story->design;?> |
story->case;?> |
+ maxVersion)):?>
story->repoCommit;?> |
+
story->bug;?> |
@@ -81,6 +83,7 @@
createLink('testcase', 'view', "caseID=$caseID", '', false, $case->PRJ), $case->title, '', "title='$case->title'") . '
';?>
+ maxVersion)):?>
revisions as $revision => $repoID):?>
|
+
bugs as $bugID => $bug):?>
createLink('bug', 'view', "bugID=$bugID"), $bug->title, '', "title='$bug->title'") . '
';?>
@@ -101,9 +105,9 @@
| |
|
|
-
|
maxVersion)):?>
|
+
|
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index b1eeb9efbd..9280aea0d7 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -50,14 +50,14 @@
app->rawModule == 'projectstory')
{
$otherParam = "storyID=&projectID={$this->session->PRJ}";
- $openModule = 'project';
+ $openGroup = 'project';
}
?>
- product}&branch={$story->branch}&moduleID={$story->module}&$otherParam", "
" . $lang->story->create, '', "class='btn btn-primary' data-group='$openModule'"); ?>
+ product}&branch={$story->branch}&moduleID={$story->module}&$otherParam", "
" . $lang->story->create, '', "class='btn btn-primary' data-group='$openGroup'"); ?>
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/testsuite/model.php b/module/testsuite/model.php
index 737050518b..f73a5f6338 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -133,7 +133,7 @@ class testsuiteModel extends model
{
return $this->dao->select("*")->from(TABLE_TESTSUITE)
->where('product')->eq((int)$productID)
- ->beginIF($this->lang->navGroup->testsuite != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
->andWhere('deleted')->eq(0)
->andWhere("(`type` = 'public' OR (`type` = 'private' and addedBy = '{$this->app->user->account}'))")
->orderBy($orderBy)
@@ -242,7 +242,7 @@ class testsuiteModel extends model
$cases = $this->dao->select('t1.*,t2.version as caseVersion')->from(TABLE_CASE)->alias('t1')
->leftJoin(TABLE_SUITECASE)->alias('t2')->on('t1.id=t2.case')
->where('t2.suite')->eq($suiteID)
- ->andWhere('t1.PRJ')->eq($this->session->PRJ)
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi()
->andWhere('t1.product')->eq($suite->product)
->andWhere('t1.product')->eq($suite->product)
->andWhere('t1.deleted')->eq(0)
@@ -286,7 +286,7 @@ class testsuiteModel extends model
$linkedCases = $this->getLinkedCases($suite->id, 'id_desc', null, $append = false);
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('id')->notIN(array_keys($linkedCases))
- ->beginIF($this->lang->navGroup->testsuite != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
->andWhere('deleted')->eq(0)
->orderBy('id desc')
->page($pager)
@@ -323,7 +323,7 @@ class testsuiteModel extends model
{
$importedCases = $this->dao->select('fromCaseID')->from(TABLE_CASE)
->where('product')->eq($productID)
- ->andWhere('PRJ')->eq($this->session->PRJ)
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
->andWhere('lib')->eq($libID)
->andWhere('fromCaseID')->ne('')
->andWhere('deleted')->eq(0)
@@ -357,7 +357,7 @@ class testsuiteModel extends model
return $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)
->beginIF($browseType != 'bysearch')->andWhere('lib')->eq($libID)->fi()
->beginIF($browseType == 'bysearch')->andWhere($query)->fi()
- ->andWhere('PRJ')->eq($this->session->PRJ)
+ ->begin($this->config->systemMode == 'new' and $this->lang->navGroup->testsuite != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
->andWhere('product')->eq(0)
->andWhere('id')->notIN($importedCases)
->orderBy($orderBy)
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index f1615d117e..c9730c2fe2 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -60,12 +60,12 @@
idAB);?>
-
priAB);?> |
-
testcase->module);?> |
-
testcase->title);?> |
-
testcase->type);?> |
-
statusAB);?> |
-
testcase->lastRunResult);?> |
+
priAB);?> |
+
testcase->module);?> |
+
testcase->title);?> |
+
testcase->type);?> |
+
statusAB);?> |
+
testcase->lastRunResult);?> |
testcase->bugsAB;?> |
testcase->resultsAB;?> |
testcase->stepNumberAB;?> |
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/testtask/model.php b/module/testtask/model.php
index 8ba40def67..5a0bda95e1 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -203,7 +203,7 @@ class testtaskModel extends model
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project = t5.project and t1.product = t5.product')
->where('t1.deleted')->eq(0)
- ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi()
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi()
->andWhere('t1.auto')->ne('unit')
->beginIF(!$this->app->user->admin)->andWhere('t3.id')->in("0,{$this->app->user->view->sprints}")->fi()
->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi()
@@ -239,7 +239,7 @@ class testtaskModel extends model
->leftJoin(TABLE_BUILD)->alias('t4')->on('t1.build = t4.id')
->where('t1.deleted')->eq(0)
->andWhere('t1.product')->eq($productID)
- ->andWhere('t1.PRJ')->eq($this->session->PRJ)
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi()
->andWhere('t1.auto')->eq('unit')
->beginIF($browseType != 'all' and $browseType != 'newest' and $beginAndEnd)
->andWhere('t1.end')->ge($beginAndEnd['begin'])
@@ -293,11 +293,11 @@ class testtaskModel extends model
}
/**
- * Get testtask pairs
- *
- * @param int $productID
- * @param int $projectID
- * @param string $appendIdList
+ * Get testtask pairs.
+ *
+ * @param int $productID
+ * @param int $projectID
+ * @param string $appendIdList
* @param string $params noempty
* @access public
* @return array
@@ -455,7 +455,7 @@ class testtaskModel extends model
{
return $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('id')->notIN($linkedCases)
- ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
->andWhere('status')->ne('wait')
->andWhere('type')->ne('unit')
->beginIF($task->branch)->andWhere('branch')->in("0,$task->branch")->fi()
@@ -484,7 +484,7 @@ class testtaskModel extends model
{
$cases = $this->dao->select('*')->from(TABLE_CASE)
->where($query)
- ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
->andWhere('product')->eq($productID)
->andWhere('status')->ne('wait')
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
@@ -517,7 +517,7 @@ class testtaskModel extends model
if($bugs)
{
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
- ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('PRJ')->eq($this->session->PRJ)->fi()
->andWhere('product')->eq($productID)
->andWhere('status')->ne('wait')
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
@@ -550,7 +550,7 @@ class testtaskModel extends model
return $this->dao->select('t1.*,t2.version as version')->from(TABLE_CASE)->alias('t1')
->leftJoin(TABLE_SUITECASE)->alias('t2')->on('t1.id=t2.case')
->where($query)
- ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi()
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi()
->andWhere('t2.suite')->eq((int)$suite)
->andWhere('t1.product')->eq($productID)
->andWhere('status')->ne('wait')
@@ -585,7 +585,7 @@ class testtaskModel extends model
->where($query)
->andWhere('t1.id')->notin($linkedCases)
->andWhere('t2.task')->eq($testTask)
- ->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi()
+ ->beginIF($this->config->systemMode == 'new' and $this->lang->navGroup->testtask != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi()
->andWhere('t1.status')->ne('wait')
->page($pager)
->fetchAll();
diff --git a/module/tree/control.php b/module/tree/control.php
index e0120056a0..16d5fe17e9 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -16,9 +16,11 @@ class tree extends control
/**
* Module browse.
*
- * @param int $rootID
+ * @param int $rootID
* @param string $viewType story|bug|case|doc
- * @param int $currentModuleID
+ * @param int $currentModuleID
+ * @param int $branch
+ * @param string $from
* @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/css/profile.css b/module/user/css/profile.css
index ea41c2106a..1fe2d2d83e 100644
--- a/module/user/css/profile.css
+++ b/module/user/css/profile.css
@@ -1,12 +1,12 @@
-.main-header{margin-bottom: 10px;}
-.row table{width: 94%; margin-left: 3%;}
-.row th{width: 17%; line-height: 30px; padding-right: 20px; text-align: right; font-weight: 500;}
-.row td{width: 33%; text-align: left; font-weight: 700;}
-.main-actions{margin: 20px 0 20px 0; text-align: center;}
-.user-title{margin: 10px 10px -10px 10px; font-size: 14px; font-weight: bold; padding-left: 10px;}
-.avatar{display: inline-block; width: 50px; height: 50px; line-height: 50px;}
-.user-name{margin-left: 15px; font-weight: bold;}
-.user-name, .user-role{font-size: 16px; vertical-align: top; line-height: 50px;}
-.line{border-top: 1px solid #eee; margin: 10px;}
-#avatarUploadBtn{padding: 4px 12px; position: relative; left: 32px; bottom: 30px;}
-#avatarForm{height: 10px}
+.main-header {margin-bottom: 10px;}
+.row table {width: 94%; margin-left: 3%;}
+.row th {width: 17%; line-height: 30px; padding-right: 20px; text-align: right; font-weight: 500;}
+.row td {width: 33%; text-align: left; font-weight: 700;}
+.main-actions {margin: 20px 0 20px 0; text-align: center;}
+.user-title {margin: 10px 10px -10px 10px; font-size: 14px; font-weight: bold; padding-left: 10px;}
+.avatar {display: inline-block; width: 50px; height: 50px; line-height: 50px;}
+.user-name {margin-left: 15px; font-weight: bold;}
+.user-name, .user-role {font-size: 16px; vertical-align: top; line-height: 50px;}
+.line {border-top: 1px solid #eee; margin: 10px;}
+#avatarUploadBtn {padding: 4px 12px; position: relative; left: 32px; bottom: 30px;}
+#avatarForm {height: 10px}
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));
|