diff --git a/module/my/control.php b/module/my/control.php
index 9f092633fa..82c3968828 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -364,7 +364,7 @@ class my extends control
$sort = $this->loadModel('common')->appendOrder($orderBy);
$bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $type, $sort, 0, $pager);
$bugs = $this->bug->checkDelayedBugs($bugs);
- $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'myBug');
+ $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false);
/* assign. */
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->bug;
diff --git a/module/product/model.php b/module/product/model.php
index 535c652d4e..0776982ac8 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -161,6 +161,7 @@ class productModel extends model
if($this->cookie->preProductID != $this->session->product)
{
+ $this->cookie->set('preBranch', 0);
setcookie('preBranch', 0, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
}
return $this->session->product;
@@ -1026,7 +1027,7 @@ class productModel extends model
->orWhere('t2.PM')->eq($this->app->user->account)
->markRight(1)
->fi()
- ->beginIF($branch)->andWhere('t1.branch')->in($branch)->fi()
+ ->beginIF($branch !== '' and $branch !== 'all')->andWhere('t1.branch')->in($branch)->fi()
->andWhere('t2.deleted')->eq('0')
->orderBy($orderBy)
->fetchAll('id');
diff --git a/module/program/js/kanban.js b/module/program/js/kanban.js
index 5824925373..8e46008db4 100644
--- a/module/program/js/kanban.js
+++ b/module/program/js/kanban.js
@@ -115,6 +115,13 @@ function processKanbanData(key, programsData)
return {id: kanbanId, columns: columns, lanes: lanes};
}
+/** Calculate column height */
+function calcColHeight(col, lane, colCards, colHeight)
+{
+ if (col.type !== 'doingProject') return colHeight;
+ return colCards.length * 62;
+}
+
$(function()
{
/* Init all kanbans */
@@ -122,6 +129,11 @@ $(function()
{
var $kanban = $('#kanban-' + key);
if(!$kanban.length) return;
- $kanban.kanban({data: processKanbanData(key, programsData), virtualize: true});
+ $kanban.kanban(
+ {
+ data: processKanbanData(key, programsData),
+ virtualize: true,
+ calcColHeight: calcColHeight
+ });
});
});
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 2fcba6a8c8..d4d985bfc6 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -18,6 +18,7 @@
product->getProductPairsByProject($project->id)) : $productID;
$buildName = $build ? " Build:{$build->name}" : '';
echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&orderBy=status,id_desc&build=$buildID&type=all"), "{$lang->bug->allBugs}" . ($type == 'all' ? " {$pager->recTotal}$buildName" : ''), '', "id='allTab' class='btn btn-link" . ('all' == $type ? ' btn-active-text' : '') . "'");
echo html::a($this->inlink('bug', "projectID={$project->id}&productID={$productID}&orderBy=status,id_desc&build=$buildID&type=unresolved"), "{$lang->bug->unResolved}" . ($type == 'unresolved' ? " {$pager->recTotal}$buildName" : ''), '', "id='unresolvedTab' class='btn btn-link" . ('unresolved' == $type ? ' btn-active-text' : '') . "'");
diff --git a/module/qa/model.php b/module/qa/model.php
index fa41835710..c128e4d35f 100644
--- a/module/qa/model.php
+++ b/module/qa/model.php
@@ -32,7 +32,10 @@ class qaModel extends model
$branch = ($this->cookie->preBranch !== '' and $branch === '') ? $this->cookie->preBranch : $branch;
setcookie('preBranch', $branch, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
- if(!in_array($this->app->rawModule, $this->config->qa->noDropMenuModule)) $this->lang->switcherMenu = $this->loadModel('product')->getSwitcher($productID, $extra, $branch);
+ $product = $this->loadModel('product')->getById($productID);
+ if($product->type != 'normal') $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
+
+ if(!in_array($this->app->rawModule, $this->config->qa->noDropMenuModule)) $this->lang->switcherMenu = $this->product->getSwitcher($productID, $extra, $branch);
if($this->app->rawModule == 'product' and $this->app->rawMethod == 'showerrornone') $this->lang->switcherMenu = '';
common::setMenuVars('qa', $productID);
}
diff --git a/module/repo/model.php b/module/repo/model.php
index 0f6766f8f0..6664e6aa7c 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -1854,6 +1854,7 @@ class repoModel extends model
public function syncCommit($repoID, $branchID)
{
$repo = $this->getRepoByID($repoID);
+ $this->scm = $this->app->loadClass('scm');
$this->scm->setEngine($repo);
$latestInDB = $this->dao->select('DISTINCT t1.*')->from(TABLE_REPOHISTORY)->alias('t1')
diff --git a/module/story/view/header.html.php b/module/story/view/header.html.php
index aa38c81062..7701d588a8 100644
--- a/module/story/view/header.html.php
+++ b/module/story/view/header.html.php
@@ -45,10 +45,13 @@ function loadProduct(productID)
*/
function loadBranch()
{
- var branch = $('#branch').val();
+ var branch = $('#branch').val();
+ var productID = $('#product').val();
if(typeof(branch) == 'undefined') branch = 0;
- loadProductModules($('#product').val(), branch);
- loadProductPlans($('#product').val(), branch);
+ if(typeof(productID) == 'undefined' && config.currentMethod == 'edit') productID = oldProductID;
+
+ loadProductModules(productID, branch);
+ loadProductPlans(productID, branch);
}
/**
diff --git a/module/testcase/control.php b/module/testcase/control.php
index e9c4568599..096ddb77d9 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1778,7 +1778,7 @@ class testcase extends control
$this->view->productID = $productID;
$this->view->branch = $branch;
$this->view->cases = $this->loadModel('testsuite')->getNotImportedCases($productID, $libID, $orderBy, $pager, $browseType, $queryID);
- $this->view->modules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch);
+ $this->view->modules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch === 'all' ? 0 : (int)$branch);
$this->view->libModules = $this->tree->getOptionMenu($libID, 'caselib');
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
@@ -1839,7 +1839,8 @@ class testcase extends control
$caseLang = $this->lang->testcase;
$caseConfig = $this->config->testcase;
- $modules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, $branch);
+ $branches = $this->loadModel('branch')->getPairs($productID);
+ $modules = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0, empty(array_keys($branches)) ? 0 : array_keys($branches));
$stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch);
$fields = $this->testcase->getImportFields($productID);
$fields = array_flip($fields);
@@ -2020,7 +2021,7 @@ class testcase extends control
$this->view->caseData = $caseData;
$this->view->stepData = $stepData;
$this->view->productID = $productID;
- $this->view->branches = $this->loadModel('branch')->getPairs($productID);
+ $this->view->branches = $branches;
$this->view->isEndPage = $pagerID >= $allPager;
$this->view->allCount = $allCount;
$this->view->allPager = $allPager;
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 0b6cbc545a..79c721e73e 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -81,7 +81,8 @@ $(function()
|
title, ENT_QUOTES), "class='form-control'")?> |
- module) ? $case->module : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->module : ''), "class='form-control chosen moduleChange'")?>
+ branch) and $case->branch != 0) ? $modules[BRANCH_MAIN] + $modules[$case->branch] : $modules;?>
+ module) ? $case->module : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->module : ''), "class='form-control chosen moduleChange'")?>
|
story) ? $case->story : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->story : '');?>
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index a024b88247..93b1d59516 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -341,7 +341,7 @@ class upgrade extends control
/* When upgrading historical data as a project, handle products that are not linked with the project. */
if(!empty($singleProducts)) $this->upgrade->computeProductAcl($singleProducts, $programID);
}
- elseif($type == 'sprint' or $type == 'moreLink')
+ elseif($type == 'sprint')
{
$linkedSprints = $this->post->sprints;
@@ -363,6 +363,43 @@ class upgrade extends control
}
}
}
+ elseif($type == 'moreLink')
+ {
+ $linkedSprints = $this->post->sprints;
+
+ /* Create Program. */
+ list($programID, $projectList, $lineID) = $this->upgrade->createProgram(array(), $linkedSprints);
+ if(dao::isError()) die(js::error(dao::getError()));
+
+ if($_POST['projectType'] == 'execution')
+ {
+ /* Use historical projects as execution upgrades. */
+ $this->upgrade->processMergedData($programID, $projectList, $lineID, array(), $linkedSprints);
+ }
+ else
+ {
+ /* Use historical projects as project upgrades. */
+ foreach($linkedSprints as $sprint)
+ {
+ $this->upgrade->processMergedData($programID, $projectList[$sprint], $lineID, array(), array($sprint => $sprint));
+ }
+
+ /* If is more-link sprints, and as project upgrade, set old relation into new project. */
+ $projectProducts = $this->dao->select('product,project,branch,plan')->from(TABLE_PROJECTPRODUCT)
+ ->where('project')->in($linkedSprints)
+ ->fetchAll();
+ foreach($projectProducts as $projectProduct)
+ {
+ $data = new stdclass();
+ $data->project = $projectList[$projectProduct->project];
+ $data->product = $projectProduct->product;
+ $data->plan = $projectProduct->plan;
+ $data->branch = $projectProduct->branch;
+
+ $this->dao->replace(TABLE_PROJECTPRODUCT)->data($data)->exec();
+ }
+ }
+ }
die(js::locate($this->createLink('upgrade', 'mergeProgram', "type=$type&programID=$programID&projectType=$projectType"), 'parent'));
}
diff --git a/module/upgrade/css/mergeprogram.css b/module/upgrade/css/mergeprogram.css
index 2d246364ce..9e85915281 100644
--- a/module/upgrade/css/mergeprogram.css
+++ b/module/upgrade/css/mergeprogram.css
@@ -35,10 +35,6 @@ div.divider {vertical-align: middle;}
.programParams td > label:first-child {margin-right: 10px;}
.programParams td > label:last-child {margin-left: 0px;}
-.lineGroup .sprintRename input {max-width: 120px;}
.projectList .scroll-handle .checkbox-primary {display: inline-block;}
-.sprintRename {margin-top: 5px;}
-.sprintRename input {display: inline-block; width: auto;}
-.sprintRename .btn-group {display: inline-block;}
.sprintGroup .sprintItem .checkbox-primary {display: inline-block;}
diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index 9e53650542..210e16600e 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -1150,45 +1150,3 @@ function isSelectAll(lineID = 0, type = 'product')
if(objectNum > checkedObjectNum || objectNum == 0) checked = false;
return checked;
}
-
-$(function()
-{
- $('.sprintItem').mouseover(function()
- {
- $(this).find('#sprintEdit').removeClass('hidden');
- }).mouseout(function()
- {
- $(this).find('#sprintEdit').addClass('hidden');
- })
-
- $(document).on('click', '#sprintEdit i', function()
- {
- $(this).parents('.sprintItem').addClass('hidden');
- $(this).parents('.sprintItem').next('.sprintRename').removeClass('hidden');
- })
-
- $('.sprintRename button.name-confirm').click(function()
- {
- var execution = $(this).parent().siblings('input').attr('name').split('_');
- var newExecutionName = $(this).parent().siblings('input').val();
- var link = createLink('execution', 'ajaxUpdateExecutionName', 'executionID=' + execution[1] + '&newExecutionName=' + newExecutionName);
- var $this = $(this);
-
- $.post(link, function(data)
- {
- if(data)
- {
- $this.closest('.sprintRename').addClass('hidden');
- $this.closest('.sprintRename').prev('.sprintItem').removeClass('hidden').find('.checkbox-primary label').text(newExecutionName);
- }
- })
- })
-
- $('.sprintRename button.name-cancel').click(function()
- {
- var oldValue = $(this).closest('.sprintRename').prev('.sprintItem').find('.checkbox-primary label').text();
- $(this).closest('.sprintRename').addClass('hidden');
- $(this).closest('.sprintRename').prev('.sprintItem').removeClass('hidden');
- $(this).parent().siblings('input').val(oldValue);
- })
-})
diff --git a/module/upgrade/view/mergebyline.html.php b/module/upgrade/view/mergebyline.html.php
index 90c156aa0e..78ae203bbb 100644
--- a/module/upgrade/view/mergebyline.html.php
+++ b/module/upgrade/view/mergebyline.html.php
@@ -50,22 +50,14 @@
diff --git a/module/upgrade/view/mergebyproduct.html.php b/module/upgrade/view/mergebyproduct.html.php
index 933d1b04a3..4aca3261d2 100644
--- a/module/upgrade/view/mergebyproduct.html.php
+++ b/module/upgrade/view/mergebyproduct.html.php
@@ -27,22 +27,14 @@
diff --git a/module/upgrade/view/mergebysprint.html.php b/module/upgrade/view/mergebysprint.html.php
index 9851a5c8b9..f9e8f59b81 100644
--- a/module/upgrade/view/mergebysprint.html.php
+++ b/module/upgrade/view/mergebysprint.html.php
@@ -17,14 +17,6 @@
$sprint):?>
id => $sprint->name), '', "data-begin='{$sprint->begin}' data-end='{$sprint->end}' data-status='{$sprint->status}' data-pm='{$sprint->PM}'");?>
-
-
- id", $sprint->name, "class='form-control'");?>
-
-
-
-
|