diff --git a/module/task/js/create.ui.js b/module/task/js/create.ui.js index 17bfb4fae2..f31c4e6d44 100644 --- a/module/task/js/create.ui.js +++ b/module/task/js/create.ui.js @@ -85,6 +85,7 @@ function toggleSelectTestStory() $('#form-task-create [data-name=datePlan]').addClass('hidden'); $('#form-task-create [data-name=estimate]').addClass('hidden'); $('#form-task-create [data-name=parent]').addClass('hidden'); + $('[name=parent]').zui('picker').$.setValue(''); $('#form-task-create [data-name=assignedToBox]').insertAfter('#form-task-create [data-name=name]'); $('#form-task-create [name=multiple]').closest('.checkbox-primary').addClass('hidden'); $('#form-task-create [data-name=testStoryBox]').removeClass('hidden'); diff --git a/module/task/model.php b/module/task/model.php index 9f7f932168..c25410a5de 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -953,6 +953,7 @@ class taskModel extends model { $task->id = $taskID; $this->updateParent($task, false); + unset($task->id); } /* Insert task desc data. */ diff --git a/test/lib/yaml.class.php b/test/lib/yaml.class.php index b80828911c..c192709af0 100644 --- a/test/lib/yaml.class.php +++ b/test/lib/yaml.class.php @@ -573,9 +573,16 @@ class yaml $tableFields = $this->dao->query("DESC {$table}")->fetchAll(); foreach($tableFields as $field) $fieldPairs[] = $field->Field; + /* 任务表没有grade字段。*/ + $hasGrade = true; foreach(array('id', 'parent', 'grade', 'path') as $field) { if(in_array($field, $fieldPairs)) continue; + if($field == 'grade') + { + $hasGrade = false; + continue; + } echo "error: Cann't fix path because the table {$table} doesn't has {$field} column." . PHP_EOL; return $this; @@ -595,8 +602,8 @@ class yaml if($parentDataID == 0) { $parentData = new stdclass(); - $parentData->grade = 0; - $parentData->path = ','; + $parentData->path = ','; + if($hasGrade) $parentData->grade = 0; } else { @@ -606,8 +613,8 @@ class yaml /* Compute it's child dataList. */ foreach($childDataList as $childDataID => $childData) { - $childData->grade = $parentData->grade + 1; - $childData->path = $parentData->path . $childData->id . ','; + $childData->path = $parentData->path . $childData->id . ','; + if($hasGrade) $childData->grade = $parentData->grade + 1; $dataList[$childDataID] = $childData; // Save child data to dataList, thus the child of child can compute it's grade and path. } unset($groupDataList[$parentDataID]); // Remove it from the groupDataList.