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

* finish task #2320.

Browse Source
This commit is contained in:
wangyidong
2015-08-26 14:54:54 +08:00
parent 0f79a4f998
commit b34c1f5c6c
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/bug/control.php
View File

@@ -1104,7 +1104,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, 'BUG #'. $bug->id . $this->lang->colon . $bug->title . ' - ' . $productName, $mailContent, $ccList);
if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError()));
}

4
module/file/model.php
View File

@@ -284,7 +284,7 @@ class fileModel extends model
*/
public function parseCSV($fileName)
{
$handle = fopen($this->session->importFile, 'r');
$handle = fopen($fileName, 'r');
$col = -1;
$row = 0;
$data = array();
@@ -369,7 +369,7 @@ class fileModel extends model
$row ++;
$col = -1;
}
fclose ($handle);
fclose($handle);
return $data;
}

2
module/project/control.php
View File

@@ -1267,7 +1267,7 @@ class project 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, 'TASK#' . $task->id . $this->lang->colon . $task->name . ' - ' . $projectName, $mailContent, $ccList);
if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError()));
}

2
module/story/control.php
View File

@@ -1074,7 +1074,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, 'STORY #' . $story->id . $this->lang->colon . $story->title . ' - ' . $productName, $mailContent, $ccList);
if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError()));
}
/**

2
module/task/control.php
View File

@@ -930,7 +930,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, 'TASK#' . $task->id . $this->lang->colon . $task->name . ' - ' . $projectName, $mailContent, $ccList);
if($this->mail->isError()) trigger_error(join("\n", $this->mail->getError()));
}