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

module/task/lang/en.php

@@ -106,7 +106,6 @@ $lang->task->team              = 'Team';
 $lang->task->transfer          = 'Transfer';
 $lang->task->transferTo        = 'Transfer To';
 $lang->task->children          = 'Child Task';
-$lang->task->unlinkParent      = 'Unlink Parent';
 $lang->task->childrenAB        = 'Child';
 $lang->task->parent            = 'Parent Task';
 $lang->task->parentAB          = 'Parent Task';

module/task/lang/zh-cn.php

@@ -106,7 +106,6 @@ $lang->task->team             = '团队';
 $lang->task->transfer         = '转交';
 $lang->task->transferTo       = '转交给';
 $lang->task->children         = '子任务';
-$lang->task->unlinkParent     = '取消子任务';
 $lang->task->childrenAB       = '子';
 $lang->task->parent           = '父任务';
 $lang->task->parentAB         = '父';

module/task/model.php

@@ -655,13 +655,13 @@ class taskModel extends model
             ->setIF($this->post->assignedTo != $oldTask->assignedTo, 'assignedDate', $now)
 
             ->setIF($this->post->status == 'wait' and $this->post->left == $oldTask->left and $this->post->consumed == 0 and $this->post->estimate, 'left', $this->post->estimate)
-            ->setIF(isset($_POST['unlinkParent']), 'parent', 0)
+            ->setIF($oldTask->parent > 0 and !$this->post->parent, 'parent', 0)
 
             ->setDefault('lastEditedBy',   $this->app->user->account)
             ->add('lastEditedDate', $now)
             ->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags)
             ->join('mailto', ',')
-            ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu,unlinkParent')
+            ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu')
             ->get();
 
         if($task->consumed < $oldTask->consumed) die(js::error($this->lang->task->error->consumedSmall));

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>