Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+change code for task#407/408/409

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2011-04-10 03:34:32 +00:00
parent d94c285fbc
commit 0690d23d22
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -740,7 +740,7 @@ class bug extends control
$mailContent = $this->parse($this->moduleName, 'sendmail');
/* Send it. */
$this->loadModel('mail')->send($toList, $productName. ':'. 'BUG #'. $bug->id . $this->lang->colon . $bug->title, $mailContent, $ccList);
$this->loadModel('mail')->send($toList, $productName . ':' . 'BUG #'. $bug->id . $this->lang->colon . $bug->title, $mailContent, $ccList);
if($this->mail->isError()) echo js::error($this->mail->getError());
}
}
module/story/control.php
+2 -3
View File
@@ -23,7 +23,6 @@ class story extends control
$this->loadModel('product');
$this->loadModel('tree');
$this->loadModel('user');
$this->products = $this->product->getPairs();
}
/**
@@ -425,7 +424,7 @@ class story extends control
/* Set toList and ccList. */
$story = $this->story->getById($storyID);
$productName = $this->products[$story->product];
$productName = $this->product->getById($story->product)->name;
$toList = $story->assignedTo;
$ccList = str_replace(' ', '', trim($story->mailto, ','));
@@ -467,7 +466,7 @@ class story extends control
$mailContent = $this->parse($this->moduleName, 'sendmail');
/* Send it. */
$this->loadModel('mail')->send($toList, $productName. ':'. 'STORY #' . $story->id . $this->lang->colon . $story->title, $mailContent, $ccList);
$this->loadModel('mail')->send($toList, $productName . ':' . 'STORY #' . $story->id . $this->lang->colon . $story->title, $mailContent, $ccList);
if($this->mail->isError()) echo js::error($this->mail->getError());
}
}
module/task/control.php
+3 -3
View File
@@ -415,8 +415,8 @@ class task extends control
private function sendmail($taskID, $actionID)
{
/* Set toList and ccList. */
$task = $this->task->getByID($taskID);
$projectName = $this->project->getByID($task->project)->name;
$task = $this->task->getById($taskID);
$projectName = $this->project->getById($task->project)->name;
$toList = $task->assignedTo;
$ccList = trim($task->mailto, ',');
@@ -452,7 +452,7 @@ class task extends control
$mailContent = $this->parse($this->moduleName, 'sendmail');
/* Send emails. */
$this->loadModel('mail')->send($toList, $projectName. ':'. 'TASK#' . $task->id . $this->lang->colon . $task->name, $mailContent, $ccList);
$this->loadModel('mail')->send($toList, $projectName . ':' . 'TASK#' . $task->id . $this->lang->colon . $task->name, $mailContent, $ccList);
if($this->mail->isError()) echo js::error($this->mail->getError());
}