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

module/project/js/common.js

@@ -174,3 +174,20 @@ $(function()
         computeWorkDays(this.id);
     })
 });
+
+$('.task-toggle').click(function()
+{
+    var obj = $(this).find('i');
+    var id  = $(this).data('id');
+    if(obj.hasClass('icon-plus'))
+    {
+        $('tr.parent-'+id).show();
+        obj.removeClass('icon-plus').addClass('icon-minus');
+    }
+    else if(obj.hasClass('icon-minus'))
+    {
+        $('tr.parent-'+id).hide();
+        obj.removeClass('icon-minus').addClass('icon-plus');
+    }
+    return false;
+});

module/project/view/task.html.php

@@ -70,7 +70,7 @@ js::set('browseType', $browseType);
         <tr class='text-center' data-id='<?php echo $task->id?>'>
           <?php foreach ($setting as $key => $value) $this->task->printCell($value, $task, $users, $browseType, $branchGroups, $modulePairs);?>
         </tr>
-          <?php if($task->children):?>
+          <?php if(!empty($task->children)):?>
             <?php foreach($task->children as $child):?>
             <tr class='text-center table-children parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>'>
               <?php foreach ($setting as $key => $value) $this->task->printCell($value, $child, $users, $browseType, $branchGroups, $modulePairs);?>