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

* Fix bug #15010.

Browse Source
This commit is contained in:
tianshujie
2021-09-08 14:09:23 +08:00
parent 21964bc998
commit e23b4cd7ff
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+11 -7
View File
@@ -694,10 +694,10 @@ class executionModel extends model
public function start($executionID)
{
$oldExecution = $this->getById($executionID);
$now = helper::now();
$now = helper::now();
$execution = fixer::input('post')
->add('realBegan', $now)
->add('realBegan', helper::today())
->setDefault('status', 'doing')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
@@ -718,7 +718,8 @@ class executionModel extends model
public function putoff($executionID)
{
$oldExecution = $this->getById($executionID);
$now = helper::now();
$now = helper::now();
$execution = fixer::input('post')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
@@ -746,7 +747,8 @@ class executionModel extends model
public function suspend($executionID)
{
$oldExecution = $this->getById($executionID);
$now = helper::now();
$now = helper::now();
$execution = fixer::input('post')
->setDefault('status', 'suspended')
->setDefault('lastEditedBy', $this->app->user->account)
@@ -771,7 +773,8 @@ class executionModel extends model
public function activate($executionID)
{
$oldExecution = $this->getById($executionID);
$now = helper::now();
$now = helper::now();
$execution = fixer::input('post')
->setDefault('status', 'doing')
->setDefault('lastEditedBy', $this->app->user->account)
@@ -838,10 +841,11 @@ class executionModel extends model
public function close($executionID)
{
$oldExecution = $this->getById($executionID);
$now = helper::now();
$now = helper::now();
$execution = fixer::input('post')
->setDefault('status', 'closed')
->setDefault('realEnd', $now)
->setDefault('realEnd', helper::today())
->setDefault('closedBy', $this->app->user->account)
->setDefault('closedDate', $now)
->setDefault('lastEditedBy', $this->app->user->account)
module/project/model.php
+4 -1
View File
@@ -1113,7 +1113,7 @@ class projectModel extends model
$now = helper::now();
$project = fixer::input('post')
->add('realBegan', $now)
->add('realBegan', helper::today())
->setDefault('status', 'doing')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
@@ -1135,6 +1135,7 @@ class projectModel extends model
{
$oldProject = $this->getById($projectID);
$now = helper::now();
$project = fixer::input('post')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
@@ -1185,6 +1186,7 @@ class projectModel extends model
{
$oldProject = $this->getById($projectID);
$now = helper::now();
$project = fixer::input('post')
->setDefault('status', 'doing')
->setDefault('lastEditedBy', $this->app->user->account)
@@ -1252,6 +1254,7 @@ class projectModel extends model
{
$oldProject = $this->getById($projectID);
$now = helper::now();
$project = fixer::input('post')
->setDefault('status', 'closed')
->setDefault('closedBy', $this->app->user->account)