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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289

Browse Source
This commit is contained in:
caoyanyi
2023-02-23 16:05:42 +08:00
parent beafe27517 65991d0a05
commit 2f3aae9281
20 changed files with 98 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/view/ajaxgetdropmenu.html.php
+8 -8
View File
@@ -206,22 +206,22 @@ $(function()
}
});
$('#swapper #dropMenu').on('onSearchComplete', function(event, value)
$('#swapper #dropMenu').on('onSearchComplete', function()
{
if($('.list-group.executions').height() == 0)
{
$('#closed').attr("hidden", true);
$('#gray-line').attr("hidden", true);
}
var listItem = $(this).find('.has-list');
listItem.each(function ()
listItem.each(function()
{
$(this).css('display','')
var $hidden = $(this).find('.hidden');
var $item = $(this).find('.search-list-item');
if($hidden.length == $item.length) $(this).css('display','none');
});
if($('.list-group.executions').height() == 0)
{
$('#closed').attr("hidden", true);
$('#gray-line').attr("hidden", true);
}
});
})
</script>
module/execution/view/edit.html.php
+4 -3
View File
@@ -15,6 +15,7 @@
<?php include '../../common/view/kindeditor.html.php';?>
<?php js::import($jsRoot . 'misc/date.js');?>
<?php js::set('isStage', $execution->type == 'stage');?>
<?php js::set('executionAttr', $execution->attribute);?>
<?php js::set('manageProductsLang', $lang->project->manageProducts);?>
<?php js::set('manageProductPlanLang', $lang->project->manageProductPlan);?>
<div id='mainContent' class='main-content'>
@@ -161,7 +162,7 @@
<?php $i = 0;?>
<?php foreach($linkedProducts as $product):?>
<tr class="<?php echo $hidden;?>">
<th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
<th id='productTitle'><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
<td class='text-left productsBox' colspan="3">
<div class='row'>
<div class="col-sm-6 productBox">
@@ -252,7 +253,7 @@
<?php $i = 0;?>
<?php foreach($linkedProducts as $product):?>
<tr>
<th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
<th id="productTitle"><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
<td class='text-left productsBox' colspan="3">
<div class='row'>
<div class="col-sm-6 productBox">
@@ -261,7 +262,7 @@
<?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
<div class='input-group <?php if($hasBranch) echo ' has-branch';?>'>
<span class='input-group-addon'><?php echo $lang->product->common;?></span>
<?php $disabled = $execution->type == 'stage' ? "disabled='disabled'" : '';?>
<?php $disabled = ($project->model == 'waterfall' or $project->model == 'waterfallplus') ? "disabled='disabled'" : '';?>
<?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' $disabled onchange='loadBranches(this)' data-last='" . $product->id . "' data-type='" . $product->type . "'");?>
<?php if($execution->type == 'stage' and !$project->division) echo html::hidden("products[$i]", $product->id);?>
</div>
module/execution/view/view.html.php
+1 -1
View File
@@ -345,7 +345,7 @@
</div>
</div>
<?php endif;?>
<?php if($execution->projectInfo->hasProduct or $execution->projectInfo->model == 'scrum'):?>
<?php if(!(strpos($execution->projectInfo->model, 'waterfall') !== false and (empty($execution->projectInfo->hasProduct) or in_array($execution->attribute, array('request', 'review'))))):?>
<div class="detail">
<div class="detail-title"><strong><?php echo $lang->execution->linkPlan;?></strong></div>
<div class="detail-content">