Merge branch 'master_xieqiyu_26991' into 'master'

* Fix bug#26991.

See merge request easycorp/zentaopms!5179
This commit is contained in:
王怡栋
2022-08-29 05:38:16 +00:00
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -53,7 +53,7 @@ js::set('page', 'confirmbug');
<?php $this->printExtendFields($bug, 'table');?>
<tr>
<th><?php echo $lang->bug->mailto;?></th>
<td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $bug->mailto), 'class="form-control picker-select" multiple');?></td>
<td colspan='2'><?php echo html::select('mailto[]', $users, $bug->mailto, 'class="form-control picker-select" multiple');?></td>
</tr>
<tr>
<th><?php echo $lang->comment;?></th>
+1 -1
View File
@@ -191,7 +191,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
<th><?php echo $lang->bug->mailto;?></th>
<td>
<div class='input-group'>
<?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control picker-select" multiple');?>
<?php echo html::select('mailto[]', $users, $bug->mailto, 'class="form-control picker-select" multiple');?>
<?php echo $this->fetch('my', 'buildContactLists');?>
</div>
</td>
+1 -1
View File
@@ -264,7 +264,7 @@
<th><?php echo $lang->bug->mailto;?></th>
<td>
<?php
if(empty($bug->mailto))
if(!empty($bug->mailto))
{
foreach(explode(',', str_replace(' ', '', $bug->mailto)) as $account) echo ' ' . zget($users, $account);
}
+1 -1
View File
@@ -1464,7 +1464,7 @@ class executionModel extends model
*/
public function getStatData($projectID = 0, $browseType = 'undone', $productID = 0, $branch = 0, $withTasks = false, $param = '', $orderBy = 'id_asc', $pager = null)
{
if($projectID) return array();
if(empty($projectID)) return array();
/* Construct the query SQL at search executions. */
$executionQuery = '';