* adjust position for the function of clear.

This commit is contained in:
wyd621
2014-03-24 01:15:44 +00:00
parent aa7a270e68
commit 01d820accb
6 changed files with 22 additions and 6 deletions

View File

@@ -1031,6 +1031,9 @@ class bug extends control
*/
public function sendmail($bugID, $actionID)
{
/* Reset $this->output. */
$this->clear();
/* Set toList and ccList. */
$bug = $this->bug->getByID($bugID);
$productName = $this->products[$bug->product];
@@ -1067,7 +1070,7 @@ class bug extends control
$this->view->bug = $bug;
$this->view->action = $action;
$this->view->users = $this->user->getPairs('noletter');
$this->clear();
$mailContent = $this->parse($this->moduleName, 'sendmail');
/* Send it. */

View File

@@ -1170,6 +1170,9 @@ class project extends control
*/
public function sendmail($taskID, $actionID)
{
/* Reset $this->output. */
$this->clear();
/* Set toList and ccList. */
$task = $this->loadModel('task')->getById($taskID);
$projectName = $this->project->getById($task->project)->name;
@@ -1204,7 +1207,7 @@ class project extends control
/* Create the email content. */
$this->view->task = $task;
$this->view->action = $action;
$this->clear();
$mailContent = $this->parse($this->moduleName, 'sendmail');
/* Send emails. */

View File

@@ -153,6 +153,9 @@ class report extends control
foreach($reminder as $user => $mail)
{
/* Reset $this->output. */
$this->clear();
/* Get email content and title.*/
$this->view->mail = $mail;
$mailContent = $this->parse('report', 'dailyreminder');
@@ -161,7 +164,6 @@ class report extends control
$mailTitle .= isset($mail->tasks) ? sprintf($this->lang->report->mailtitle->task, count($mail->tasks)) : '';
$mailTitle .= isset($mail->todos) ? sprintf($this->lang->report->mailtitle->todo, count($mail->todos)) : '';
$mailTitle = rtrim($mailTitle, ',');
$this->clear();
/* Send email.*/
echo date('Y-m-d H:i:s') . " sending to $user, ";

View File

@@ -854,6 +854,9 @@ class story extends control
*/
public function sendmail($storyID, $actionID)
{
/* Reset $this->output. */
$this->clear();
$story = $this->story->getById($storyID);
$productName = $this->product->getById($story->product)->name;
@@ -903,7 +906,7 @@ class story extends control
$this->view->story = $story;
$this->view->action = $action;
$this->view->users = $this->user->getPairs('noletter');
$this->clear();
$mailContent = $this->parse($this->moduleName, 'sendmail');
/* Send it. */

View File

@@ -769,6 +769,9 @@ class task extends control
*/
public function sendmail($taskID, $actionID)
{
/* Reset $this->output. */
$this->clear();
/* Set toList and ccList. */
$task = $this->task->getById($taskID);
$projectName = $this->project->getById($task->project)->name;
@@ -805,7 +808,7 @@ class task extends control
$this->view->task = $task;
$this->view->action = $action;
$this->view->users = $users;
$this->clear();
$mailContent = $this->parse($this->moduleName, 'sendmail');
/* Send emails. */

View File

@@ -766,6 +766,9 @@ class testtask extends control
*/
public function sendmail($testtaskID, $actionID, $actionType)
{
/* Reset $this->output. */
$this->clear();
$testtask = $this->testtask->getByID($testtaskID);
$action = $this->action->getById($actionID);
$users = $this->loadModel('user')->getPairs('noletter');
@@ -773,7 +776,6 @@ class testtask extends control
$this->view->testtask = $testtask;
$this->view->action = $action;
$this->view->users = $users;
$this->clear();
$mailContent = $this->parse($this->moduleName, 'sendmail');