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

* fix bug #543.

Browse Source
This commit is contained in:
xia0ta0
2013-11-20 14:48:52 +08:00
parent bea380c7e1
commit 409d07ae2b
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
-14
View File
@@ -168,14 +168,6 @@ class bugModel extends model
if($setImgSize) $bug->steps = $this->loadModel('file')->setImgSize($bug->steps);
foreach($bug as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $bug->$key = '';
if($bug->mailto)
{
$bug->mailto = ltrim(trim($bug->mailto), ','); // Remove the first ,
$bug->mailto = str_replace(' ', '', $bug->mailto);
$bug->mailto = rtrim($bug->mailto, ',') . ',';
$bug->mailto = str_replace(',', ', ', $bug->mailto);
}
if($bug->duplicateBug) $bug->duplicateBugTitle = $this->dao->findById($bug->duplicateBug)->from(TABLE_BUG)->fields('title')->fetch('title');
if($bug->case) $bug->caseTitle = $this->dao->findById($bug->case)->from(TABLE_CASE)->fields('title')->fetch('title');
if($bug->linkBug) $bug->linkBugTitles = $this->dao->select('id,title')->from(TABLE_BUG)->where('id')->in($bug->linkBug)->fetchPairs();
@@ -261,12 +253,6 @@ class bugModel extends model
->where('id')->eq((int)$bugID)
->exec();
/* format mailto. */
$bug->mailto = ltrim(trim($bug->mailto), ',');
$bug->mailto = str_replace(' ','', $bug->mailto);
$bug->mailto = rtrim($bug->mailto, ',') . ',';
$bug->mailto = str_replace(',', ', ', $bug->mailto);
if(!dao::isError()) return common::createChanges($oldBug, $bug);
}
module/task/model.php
-7
View File
@@ -663,13 +663,6 @@ class taskModel extends model
if($setImgSize) $task->desc = $this->loadModel('file')->setImgSize($task->desc);
if($task->assignedTo == 'closed') $task->assignedToRealName = 'Closed';
foreach($task as $key => $value) if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $task->$key = '';
if($task->mailto)
{
$task->mailto = ltrim(trim($task->mailto), ','); // remove the first ,
$task->mailto = str_replace(' ', '', $task->mailto);
$task->mailto = rtrim($task->mailto, ',') . ',';
$task->mailto = str_replace(',', ', ', $task->mailto);
}
$task->files = $this->loadModel('file')->getByObject('task', $taskID);
return $this->processTask($task);
}