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

module/task/view/edit.html.php

@@ -103,18 +103,12 @@
                 <td><span id="storyIdBox"><?php echo html::select('story', $stories, $task->story, "class='form-control chosen'");?></span></td>
               </tr>
               <?php endif;?>
-              <?php if($task->parent == 0 and empty($task->team)):?>
+              <?php if($task->parent >= 0 and empty($task->team)):?>
               <tr>
                 <th><?php echo $lang->task->parent;?></th>
                 <td><?php echo html::select('parent', $tasks, $task->parent, "class='form-control chosen'");?></td>
               </tr>
               <?php endif;?>
-              <?php if($task->parent > 0):?>
-              <tr>
-                <th><?php echo $lang->task->unlinkParent;?></th>
-                <td><?php echo html::checkbox('unlinkParent', '');?></td>
-              </tr>
-              <?php endif;?>
               <tr>
                 <th><?php echo $lang->task->assignedTo;?></th>
                 <td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></span></td>

module/task/view/view.html.php

@@ -247,7 +247,7 @@
                 </tr>
                 <?php endif;?>
                 <tr>
-                  <th><?php echo empty($task->team) ? $lang->task->assignTo : $lang->task->transferTo;?></th>
+                  <th><?php echo $lang->task->assignedTo;?></th>
                   <td><?php echo $task->assignedTo ? $task->assignedToRealName . $lang->at . $task->assignedDate : $lang->noData;?></td>
                 </tr>
                 <tr>