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

* Revert code.

Browse Source
This commit is contained in:
wangyidong
2023-08-30 08:59:57 +08:00
parent 7d274eb644
commit 8c441c413e
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+1 -1
View File
@@ -771,7 +771,7 @@ class product extends control
$this->view->users = $this->user->getPairs('noletter');
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->branches = $this->loadModel('branch')->getPairs($productID);
$this->view->reviewers = $product->reviewer ? explode(',', $product->reviewer) : array();
$this->view->reviewers = explode(',', $product->reviewer);
$this->display();
}
module/task/model.php
+7 -7
View File
@@ -2409,12 +2409,12 @@ class taskModel extends model
->andWhere('t1.vision')->eq($this->config->vision)
->fetch();
if(!$task) return false;
if($task->openedDate) $task->openedDate = substr($task->openedDate, 0, 19);
if($task->finishedDate) $task->finishedDate = substr($task->finishedDate, 0, 19);
if($task->canceledDate) $task->canceledDate = substr($task->canceledDate, 0, 19);
if($task->closedDate) $task->closedDate = substr($task->closedDate, 0, 19);
if($task->lastEditedDate) $task->lastEditedDate = substr($task->lastEditedDate, 0, 19);
if($task->realStarted) $task->realStarted = substr($task->realStarted, 0, 19);
$task->openedDate = substr($task->openedDate, 0, 19);
$task->finishedDate = substr($task->finishedDate, 0, 19);
$task->canceledDate = substr($task->canceledDate, 0, 19);
$task->closedDate = substr($task->closedDate, 0, 19);
$task->lastEditedDate = substr($task->lastEditedDate, 0, 19);
$task->realStarted = substr($task->realStarted, 0, 19);
$children = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->eq($taskID)->andWhere('deleted')->eq(0)->fetchAll('id');
$task->children = $children;
@@ -4695,7 +4695,7 @@ class taskModel extends model
}
}
$mailto = $task->mailto ? explode(',', $task->mailto) : array();
$mailto = explode(',', $task->mailto);
foreach($mailto as $key => $account)
{
$account = trim($account);
module/user/model.php
+1 -4
View File
@@ -2712,10 +2712,7 @@ class userModel extends model
$users = array();
foreach(explode(',', trim($this->app->company->admins, ',')) as $admin) $users[$admin] = $admin;
if(!empty($product->reviewer))
{
foreach(explode(',', trim($product->reviewer, ',')) as $account) $users[$account] = $account;
}
foreach(explode(',', trim($product->reviewer, ',')) as $account) $users[$account] = $account;
if(isset($product->PMT))
{
foreach(explode(',', trim($product->PMT, ',')) as $account) $users[$account] = $account;