diff --git a/module/report/config.php b/module/report/config.php index a82b84a83f..b9e013d52e 100644 --- a/module/report/config.php +++ b/module/report/config.php @@ -1,5 +1,6 @@ report->dailyreminder = new stdclass(); $config->report->dailyreminder->bug = true; $config->report->dailyreminder->task = true; $config->report->dailyreminder->todo = true; diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php index 8d835e57ba..bcd185ec25 100644 --- a/module/report/lang/zh-cn.php +++ b/module/report/lang/zh-cn.php @@ -76,6 +76,7 @@ $lang->report->bugTitle = 'Bug标题'; $lang->report->taskName = '任务名称'; $lang->report->todoName = 'Todo名称'; +$lang->report->mailtitle = new stdclass(); $lang->report->mailtitle->begin = '提醒:您有'; $lang->report->mailtitle->bug = " Bugs(%s),"; $lang->report->mailtitle->task = " 任务(%s),"; diff --git a/module/story/model.php b/module/story/model.php index 9c9a034423..799dba78d0 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -375,6 +375,7 @@ class storyModel extends model { $oldStory = $this->getById($storyID); + $story = new stdclass(); $story->lastEditedBy = $this->app->user->account; $story->lastEditedDate = $now; $story->status = $oldStory->status; diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 913b3760ff..fd456c7944 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -11,7 +11,7 @@ */ ?> -
+ diff --git a/module/task/control.php b/module/task/control.php index bb1fb82979..ba4a74ec21 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -119,7 +119,7 @@ class task extends control foreach($mails as $mail) { $this->sendmail($mail->taskID, $mail->actionID); - } + } /* Locate the browser. */ if($iframe) die(js::reload('parent.parent')); diff --git a/module/task/model.php b/module/task/model.php index ac8fefb93c..d68353e0c1 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -129,7 +129,9 @@ class taskModel extends model $taskID = $this->dao->lastInsertID(); if($tasks->story[$i] != false) $this->story->setStage($tasks->story[$i]); $actionID = $this->action->create('task', $taskID, 'Opened', ''); - $mails[$i]->taskID = $taskID; + + $mails[$i] = new stdclass(); + $mails[$i]->taskID = $taskID; $mails[$i]->actionID = $actionID; } else diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 3512d20445..aaa753ed1f 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -13,7 +13,7 @@ task->batchCreate);?> - +
story->product . $lang->colon . $lang->story->batchCreate;?>
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index c6a8ca2ddd..a94dabdf88 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -13,7 +13,7 @@ testcase->batchCreate);?> - +
task->project . $lang->colon . $lang->task->batchCreate;?>
diff --git a/module/todo/model.php b/module/todo/model.php index bb48aaea0c..e47d894eba 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -58,6 +58,7 @@ class todoModel extends model { if($todos->names[$i] != '' || isset($todos->bugs[$i + 1]) || isset($todos->tasks[$i + 1])) { + $todo = new stdclass(); $todo->account = $this->app->user->account; if($this->post->date == false) { diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php index d458764f98..c980734b3b 100755 --- a/module/todo/view/batchcreate.html.php +++ b/module/todo/view/batchcreate.html.php @@ -12,7 +12,7 @@ ?> - +
testcase->batchCreate;?>
todo->batchCreate . $lang->colon . html::input('date', $date, "class='select-2 date' onchange='updateAction(this.value)'");?> todo->periods['future'];?>