diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 24ced2b549..622d88029b 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -14,7 +14,7 @@ story->placeholder); ?> -
+ diff --git a/module/task/control.php b/module/task/control.php index e97fec8766..ecd7c17231 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -65,8 +65,16 @@ class task extends control if(!empty($_POST)) { + $responser['result'] = 'success'; + $responser['message'] = ''; + $tasksID = $this->task->create($projectID); - if(dao::isError()) die(js::error(dao::getError())); + if(dao::isError()) + { + $responser['result'] = 'fail'; + $responser['message'] = dao::getError(); + $this->send($responser); + } /* Create actions. */ $this->loadModel('action'); @@ -79,16 +87,24 @@ class task extends control /* Locate the browser. */ if($this->post->after == 'continueAdding') { - echo js::alert($this->lang->task->successSaved . $this->lang->task->afterChoices['continueAdding']); - die(js::locate($this->createLink('task', 'create', "projectID=$projectID&storyID={$this->post->story}"), 'parent')); + $responser['message'] = $this->lang->task->successSaved . $this->lang->task->afterChoices['continueAdding']; + $responser['locate'] = $this->createLink('task', 'create', "projectID=$projectID&storyID={$this->post->story}"); + $this->send($responser); } elseif($this->post->after == 'toTaskList') { - die(js::locate($taskLink, 'parent')); + $responser['locate'] = $taskLink; + $this->send($responser); } elseif($this->post->after == 'toStoryList') { - die(js::locate($storyLink, 'parent')); + $responser['locate'] = $storyLink; + $this->send($responser); + } + else + { + $responser['locate'] = $taskLink; + $this->send($responser); } } diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 09dcccaaa7..f9251a5f56 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -11,13 +11,14 @@ */ ?> +task->placeholder); ?> - +
story->create;?>
task->create;?> @@ -102,5 +103,6 @@
+