diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 9bc469e2ad..0925f4f923 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -101,6 +101,11 @@ } else { + if(!isset($taskMembers[$tasks[$taskID]->assignedTo])) + { + $members = $this->project->getTeamMemberPairs($tasks[$taskID]->project, 'nodeleted'); + $members = array('' => '', 'ditto' => $this->lang->task->ditto) + $members; + } $taskMembers = $members; } ?> diff --git a/module/todo/model.php b/module/todo/model.php index 4af2b7da86..7fa113bd2a 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -33,7 +33,7 @@ class todoModel extends model ->setIF($this->post->type == 'feedback' and $this->post->feedback, 'idvalue', $this->post->feedback) ->setIF($this->post->date == false, 'date', '2030-01-01') ->setIF($this->post->begin == false, 'begin', '2400') - ->setIF($this->post->end == false, 'end', '2400') + ->setIF($this->post->begin == false or $this->post->end == false, 'end', '2400') ->stripTags($this->config->todo->editor->create['id'], $this->config->allowedTags) ->remove('bug, task, story, uid, feedback') ->get(); diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php index 213a0f2737..fef1977900 100644 --- a/module/user/view/story.html.php +++ b/module/user/view/story.html.php @@ -51,7 +51,7 @@
$story):?> createLink('story', 'view', "id=$story->id");?> -