Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2018-09-07 14:11:10 +08:00
parent 6be860c4d2 fb9e21ffa4
commit c2907dc63a
9 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/js/common.js
+2
View File
@@ -341,6 +341,7 @@ function loadProjectBuilds(projectID)
branch = $('#branch').val();
if(typeof(branch) == 'undefined') branch = 0;
productID = $('#product').val();
oldOpenedBuild = $('#openedBuild').val() ? $('#openedBuild').val() : 0;
if(page == 'create')
{
@@ -352,6 +353,7 @@ function loadProjectBuilds(projectID)
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch);
$('#openedBuildBox').load(link, function(){$(this).find('select').chosen()});
oldResolvedBuild = $('#resolvedBuild').val() ? $('#resolvedBuild').val() : 0;
link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch);
$('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen()});
}
module/build/model.php
+1 -1
View File
@@ -84,7 +84,7 @@ class buildModel extends model
$selectedBuilds = array();
if(strpos($params, 'noempty') === false) $sysBuilds = array('' => '');
if(strpos($params, 'notrunk') === false) $sysBuilds = $sysBuilds + array('trunk' => $this->lang->trunk);
if($buildID != 0) $selectedBuilds = $this->dao->select('id, name')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetchPairs();
if($buildID != 0) $selectedBuilds = $this->dao->select('id, name')->from(TABLE_BUILD)->where('id')->in($buildID)->fetchPairs();
$projectBuilds = $this->dao->select('t1.id, t1.name, t1.project, t2.status as projectStatus, t3.id as releaseID, t3.status as releaseStatus, t4.name as branchName')->from(TABLE_BUILD)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
module/project/js/kanban.js
+2 -2
View File
@@ -2,12 +2,12 @@ $(function()
{
$('.c-boards').each(function()
{
var height = $(window).height() - $('#header').height() - $('#footer').height() - 40 - 101;
var height = $(window).height() - $('#header').height() - $('#footer').height() - 40 - 105;
var $boardsWrapper = $(this).find('.boards-wrapper');
$boardsWrapper.height(height);
if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
{
$boardsWrapper.find('.boards').css('height', $(this).height());
$boardsWrapper.find('.boards').css('height', $(this).height() - 1);
}
});
module/project/view/create.html.php
+1 -1
View File
@@ -122,7 +122,7 @@
<?php $i = 0;?>
<?php foreach($products as $product):?>
<?php $plans = zget($productPlans, $product->id, array(0 => ''));?>
<div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select("plans[" . $product->id . "]", $plans, $product->plan, "class='form-control chosen'");?></div>
<div class="col-sm-4" id="plan<?php echo $i;?>"><?php echo html::select("plans[" . $product->id . "]", $plans, '', "class='form-control chosen'");?></div>
<?php $i++;?>
<?php endforeach;?>
<?php else:?>
module/testtask/control.php
+2 -2
View File
@@ -412,8 +412,8 @@ class testtask extends control
if($groupBy == 'story' && $task->build)
{
$buildStoryIDs = $this->dao->select('stories')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('stories');
$buildStories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($buildStoryIDs)->andWhere('id')->notin(array_keys($groupCases))->fetchAll('id');
$buildStoryIdList = $this->dao->select('stories')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('stories');
$buildStories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($buildStoryIdList)->andWhere('id')->notin(array_keys($groupCases))->fetchAll('id');
foreach($buildStories as $buildStory)
{
$groupCases[$buildStory->id][] = $buildStory;
module/testtask/view/groupcase.html.php
+2 -2
View File
@@ -58,8 +58,8 @@
<?php
if(!isset($run->case))
{
echo "<td colspan='13'></td>";
continue;
echo "<td colspan='13'></td></tr>";
break;
}
?>
<td class='c-id-sm'><?php echo sprintf('%03d', $run->case);?></td>
module/tree/control.php
+2 -1
View File
@@ -317,7 +317,8 @@ class tree extends control
if($confirm == 'no')
{
$module = $this->tree->getByID($moduleID);
die(js::confirm($module->type == 'line' ? $this->lang->tree->confirmDeleteLine : $this->lang->tree->confirmDelete, $this->createLink('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=yes")));
$confirmLang = $module->type == 'line' ? $this->lang->tree->confirmDeleteLine : $this->lang->tree->confirmDelete;
die(js::confirm($confirmLang, $this->createLink('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=yes")));
}
else
{
module/tree/model.php
+1 -3
View File
@@ -1312,9 +1312,7 @@ class treeModel extends model
if(isset($module->root) and $module->root != $self->root)
{
$this->dao->update(TABLE_MODULE)->set('root')->eq($module->root)->where('id')->in($childs)->exec();
$selfProduct = $this->loadModel('product')->getByID($self->root);
$product = $this->loadModel('product')->getByID($module->root);
if($selfProduct->type == 'branch' and $product->type != 'branch') $this->dao->update(TABLE_MODULE)->set('branch')->eq(0)->where('id')->in($childs)->exec();
$this->dao->update(TABLE_MODULE)->set('branch')->eq(0)->where('id')->in($childs)->exec();
}
$this->fixModulePath(isset($module->root) ? $module->root : $self->root, $self->type);
if(isset($module->root) and $module->root != $self->root) $this->changeRoot($moduleID, $self->root, $module->root, $self->type);
module/tree/view/edit.html.php
+1
View File
@@ -86,4 +86,5 @@ $(function()
getProductModules($(this).val());
})
})
$(function(){$('.chosen').chosen();})
</script>