Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

* fix bug #15834

See merge request easycorp/zentaopms!3119
This commit is contained in:
王怡栋
2022-04-26 07:55:47 +00:00
2 changed files with 6 additions and 0 deletions
+4
View File
@@ -131,6 +131,7 @@
</td>
</tr>
<?php endif;?>
<?php if(!in_array($execution->attribute, array('request', 'design', 'review'))): ?>
<tr>
<th><?php echo $lang->execution->manageProducts;?></th>
<td class='text-left' id='productsBox' colspan="2">
@@ -181,6 +182,9 @@
</div>
</td>
</tr>
<?php else: ?>
<?php echo html::hidden("products[]", key($linkedProducts));?>
<?php endif; ?>
<tr>
<th><?php echo $lang->execution->team;?></th>
<td colspan='2'><?php echo html::select('teamMembers[]', $users, array_keys($teamMembers), "class='form-control chosen' multiple"); ?></td>
+2
View File
@@ -190,6 +190,7 @@
</p>
</div>
</div>
<?php if(!in_array($execution->attribute, array('request', 'design', 'review'))): ?>
<div class="detail">
<div class="detail-title">
<strong><?php echo $lang->execution->manageProducts;?></strong>
@@ -208,6 +209,7 @@
</div>
</div>
</div>
<?php endif; ?>
<div class="detail">
<div class="detail-title"><strong><?php echo $lang->execution->linkPlan;?></strong></div>
<div class="detail-content">