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

module/project/css/common.css

@@ -11,8 +11,8 @@
 #productsBox .input-group.has-branch > select[name*="branch"] + .chosen-container.chosen-container-active  .chosen-single {border-left-width: 1px; padding-left: 8px;}
 
 .table-children {border-left: 2px solid #cbd0db; border-right: 2px solid #cbd0db;}
-.table-children.table-child-top {border-top: 2px solid #cbd0db;}
-.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
+.table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
+.table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
 .table td.has-child > a {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 .table td.has-child > .task-toggle {color: #838a9d; position: relative; top: 1px;}
 .table td.has-child > .task-toggle:hover {color: #006af1; cursor: pointer;}

module/project/view/task.html.php

@@ -225,12 +225,14 @@ js::set('browseType', $browseType);
             <?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?>
           </tr>
           <?php if(!empty($task->children)):?>
+          <?php $i = 0;?>
           <?php foreach($task->children as $key => $child):?>
-          <?php $class  = $key == 0 ? ' table-child-top' : '';?>
-          <?php $class .= ($key + 1 == count($task->children)) ? ' table-child-bottom' : '';?>
+          <?php $class  = $i == 0 ? ' table-child-top' : '';?>
+          <?php $class .= ($i + 1 == count($task->children)) ? ' table-child-bottom' : '';?>
           <tr class='table-children<?php echo $class;?> parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>' data-consumed='<?php echo $child->consumed?>' data-left='<?php echo $child->left?>'>
             <?php foreach($customFields as $field) $this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);?>
           </tr>
+          <?php $i ++;?>
           <?php endforeach;?>
           <?php endif;?>
           <?php endforeach;?>

module/task/model.php

@@ -1511,7 +1511,7 @@ class taskModel extends model
             ->beginIF(is_array($type) or strpos(',all,undone,needconfirm,assignedtome,delayed,finishedbyme,myinvolved,', ",$type,") === false)->andWhere('t1.status')->in($type)->fi()
             ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
             ->andWhere('t1.deleted')->eq(0)
-            ->orderBy('t1.`parent`,' . $orderBy)
+            ->orderBy($orderBy)
             ->page($pager, 't1.id')
             ->fetchAll('id');