* Fix bug #16426,#16393.

This commit is contained in:
liyuchun
2021-11-18 23:17:15 +08:00
parent d188fbd7b8
commit a240c9aa23
4 changed files with 25 additions and 9 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
.branch-list {padding-left: 0; margin: 0;}
.branch-list > li {float: left; list-style: none; width: 50%; margin: 5px 0;}
.data-basic.table-data tbody > tr > th {width: 100px;}
.table-data tbody > tr > th {width: 110px;}
.col-12 .cell table td {word-wrap: break-word; word-break: normal;}
td.normal {color: #00da88;}
td.acl {white-space: nowrap;}
+8 -8
View File
@@ -43,7 +43,7 @@
<table class="table table-data">
<tbody>
<tr>
<th class='w-65px'><i class="icon icon-person icon-sm"></i> <?php echo $lang->productCommon;?></th>
<th><i class="icon icon-person icon-sm"></i> <?php echo $lang->productCommon;?></th>
<td><strong><?php echo zget($users, $product->PO);?></strong></td>
<th><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->release;?></th>
<td><strong><?php echo zget($users, $product->RD);?></strong></td>
@@ -74,21 +74,21 @@
<tbody>
<tr>
<?php if(!empty($product->code)):?>
<th class="w-80px"><?php echo $lang->product->code;?></th>
<th><?php echo $lang->product->code;?></th>
<td><strong><?php echo $product->code;?></strong></td>
<?php else:?>
<th class="w-80px"><?php echo $lang->product->type;?></th>
<th><?php echo $lang->product->type;?></th>
<td><strong><?php echo zget($lang->product->typeList, $product->type);?></strong></td>
<?php endif;?>
<th class="w-80px"><?php echo $lang->story->openedBy?></th>
<th><?php echo $lang->story->openedBy?></th>
<td colspan="2"><strong><?php echo zget($users, $product->createdBy);?></strong></td>
</tr>
<tr>
<?php if(!empty($product->code)):?>
<th class="w-80px"><?php echo $lang->product->type;?></th>
<th><?php echo $lang->product->type;?></th>
<td><strong><?php echo zget($lang->product->typeList, $product->type);?></strong></td>
<?php else:?>
<th class="w-80px"><?php echo $lang->productCommon . $lang->product->status;?></th>
<th><?php echo $lang->productCommon . $lang->product->status;?></th>
<td class="<?php echo $product->status;?>"><strong><?php echo zget($lang->product->statusList, $product->status);?></strong></td>
<?php endif;?>
<th><?php echo $lang->story->openedDate?></th>
@@ -96,7 +96,7 @@
</tr>
<tr>
<?php if(!empty($product->code)):?>
<th class="w-80px"><?php echo $lang->productCommon . $lang->product->status;?></th>
<th><?php echo $lang->productCommon . $lang->product->status;?></th>
<td class="<?php echo $product->status;?>"><strong><?php echo zget($lang->product->statusList, $product->status);?></strong></td>
<?php endif;?>
<th><?php echo $lang->product->acl;?></th>
@@ -130,7 +130,7 @@
<td><strong><?php echo $product->stories['active']?></strong></td>
<th><?php echo $lang->product->plans?></th>
<td><strong><?php echo $product->plans?></strong></td>
<th class='w-80px'><?php echo $lang->product->bugs?></th>
<th><?php echo $lang->product->bugs?></th>
<td><strong><?php echo $product->bugs?></strong></td>
</tr>
<tr>
+10
View File
@@ -166,6 +166,16 @@ $config->story->datatable->fieldList['lastEditedDate']['fixed'] = 'no';
$config->story->datatable->fieldList['lastEditedDate']['width'] = '90';
$config->story->datatable->fieldList['lastEditedDate']['required'] = 'no';
$config->story->datatable->fieldList['feedbackBy']['title'] = 'feedbackBy';
$config->story->datatable->fieldList['feedbackBy']['fixed'] = 'no';
$config->story->datatable->fieldList['feedbackBy']['width'] = '100';
$config->story->datatable->fieldList['feedbackBy']['required'] = 'no';
$config->story->datatable->fieldList['notifyEmail']['title'] = 'notifyEmail';
$config->story->datatable->fieldList['notifyEmail']['fixed'] = 'no';
$config->story->datatable->fieldList['notifyEmail']['width'] = '100';
$config->story->datatable->fieldList['notifyEmail']['required'] = 'no';
$config->story->datatable->fieldList['mailto']['title'] = 'mailto';
$config->story->datatable->fieldList['mailto']['fixed'] = 'no';
$config->story->datatable->fieldList['mailto']['width'] = '100';
+6
View File
@@ -3749,6 +3749,12 @@ class storyModel extends model
case 'lastEditedDate':
echo substr($story->lastEditedDate, 5, 11);
break;
case 'feedbackBy':
echo $story->feedbackBy;
break;
case 'notifyEmail':
echo $story->notifyEmail;
break;
case 'mailto':
$mailto = explode(',', $story->mailto);
foreach($mailto as $account)