Merge branch 'sprint/172_liyuchun_bug' into 'sprint/168'

Sprint/172 liyuchun bug

See merge request easycorp/zentaopms!535

module/bug/css/create.css

@@ -45,6 +45,8 @@ html[lang='en'] #deadlineTd .input-group-addon {padding: 5px 18px;}
 #osBox .required:after {right: 1px;}
 #osBox {width: 190px;}
 #projectBox .required:after {right: 1px;}
-#assignedTo_chosen {width: 153px !important; float: left;}
-#assignedBox .load-all-user {float: left;}
-#assignedBox .load-all-user .btn {border-left: none;}
+#assignedTo_chosen, .load-all-user {float: left;;}
+.assigned-box #assignedTo_chosen {width: 81% !important;}
+.deadline-box #assignedTo_chosen {width: 153px !important;}
+.assigned-box .load-all-user {float: left;}
+.assigned-box .load-all-user .btn {border-left: none;}

module/bug/view/create.html.php

@@ -130,11 +130,11 @@ js::set('moduleID', $moduleID);
             <th><nobr><?php echo $lang->bug->lblAssignedTo;?></nobr></th>
             <td>
               <div class='table-row'>
-                <div class='table-col' id='assignedBox'>
+                <?php $showDeadline = strpos(",$showFields,", ',deadline,') !== false;?>
+                <div class='table-col <?php echo $showDeadline ? 'deadline-box' : 'assigned-box';?>'>
                   <?php echo html::select('assignedTo', $productMembers, $assignedTo, "class='form-control chosen'");?>
                   <span class='input-group-btn load-all-user'><?php echo html::commonButton($lang->bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
                 </div>
-                <?php $showDeadline = strpos(",$showFields,", ',deadline,') !== false;?>
                 <?php if($showDeadline):?>
                 <div class='table-col'>
                   <div class='input-group' id='deadlineBox'>

module/personnel/model.php

@@ -607,7 +607,7 @@ class personnelModel extends model
                 if($oldWhitelist) $accounts = array_unique(array_merge($accounts, $oldWhitelist));
             }
         }
-        $whitelist = ',' . implode(',', $accounts);
+        $whitelist = !empty($accounts) ? ',' . implode(',', $accounts) : '';
         $this->dao->update($objectTable)->set('whitelist')->eq($whitelist)->where('id')->eq($objectID)->exec();
 
         $deletedAccounts = array();

module/product/css/view.css

@@ -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;}

module/product/view/view.html.php

@@ -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>

module/story/config.php

@@ -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';

module/story/model.php

@@ -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)