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

module/bug/control.php

@@ -1598,6 +1598,7 @@ class bug extends control
                     $mailto = trim($mailto);
                     if(isset($users[$mailto])) $bug->mailto .= $users[$mailto] . ',';
                 }
+                $bug->mailto = rtrim($bug->mailto, ',');
 
                 unset($bug->caseVersion);
                 unset($bug->result);

module/build/view/view.html.php

@@ -314,10 +314,10 @@ tbody tr td:first-child input{display:none;}
                 </tr>
                 <?php if($this->config->global->flow != 'onlyTest'):?>
                 <tr>
-                  <th><?php echo $lang->build->desc;?></th>
+                  <th style="vertical-align:top"><?php echo $lang->build->desc;?></th>
                   <td>
                     <?php if($build->desc):?>
-                    <div class='article-content'><?php echo $build->desc;?></div>
+                    <?php echo $build->desc;?>
                     <?php else:?>
                     <?php echo $lang->build->noData;?>
                     <?php endif;?>

module/project/view/tree.html.php

@@ -45,7 +45,7 @@
       </ul>
     </div>
     <?php
-    $misc = common::hasPriv('task', 'export', $project) ? "class='btn btn-link'" : "class='btn btn-link disabled'";
+    $misc = "class='btn btn-link iframe" . (common::hasPriv('task', 'export', $project) ? ' dtisabled' : '') . "' data-width='700'";
     $link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType") : '#';
     echo html::a($link, "<i class='icon icon-export muted'></i> <span class='text'>{$lang->export}</span>", '', $misc);
 

module/testreport/lang/en.php

@@ -33,6 +33,7 @@ $lang->testreport->profile     = 'Profile';
 $lang->testreport->value       = 'Value';
 $lang->testreport->none        = 'None';
 $lang->testreport->all         = 'All Report';
+$lang->testreport->deleted     = 'Deleted';
 
 $lang->testreport->legendBasic       = 'Basic Info';
 $lang->testreport->legendStoryAndBug = 'Stories and Bugs of Test';

module/testreport/lang/zh-cn.php

@@ -33,6 +33,7 @@ $lang->testreport->profile     = '概况';
 $lang->testreport->value       = '值';
 $lang->testreport->none        = '无';
 $lang->testreport->all         = '所有报告';
+$lang->testreport->deleted     = '已删除';
 
 $lang->testreport->legendBasic       = '基本信息';
 $lang->testreport->legendStoryAndBug = '测试范围';

module/testreport/view/create.html.php

@@ -42,6 +42,7 @@
                 <?php echo html::select('owner', $users, $owner, "class='form-control chosen'")?>
               </div>
             </td>
+            <td class='w-50px'></td>
           </tr>
           <tr>
             <th><?php echo $lang->testreport->members?></th>

module/testreport/view/edit.html.php

@@ -42,6 +42,7 @@
                 <?php echo html::select('owner', $users, $report->owner, "class='form-control chosen'")?>
               </div>
             </td>
+            <td class='w-50px'></td>
           </tr>
           <tr>
             <th><?php echo $lang->testreport->members?></th>

module/testreport/view/view.html.php

@@ -21,6 +21,9 @@
     <div class='page-title'>
       <span class='label label-id'><?php echo $report->id;?></span>
       <span class='text'><?php echo $report->title;?></span>
+      <?php if($report->deleted):?>
+      <span class='label label-danger'><?php echo $lang->testreport->deleted;?></span>
+      <?php endif; ?>
     </div>
   </div>
 </div>