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

* Rename recordEstimate to recordWorkhour.

Browse Source
This commit is contained in:
sunguangming
2023-05-25 15:53:00 +08:00
parent 649956a752
commit 2777ec9622
19 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+5 -5
View File
@@ -1306,15 +1306,15 @@ class taskModel extends model
* Record workhour and left of task.
*
* @param int $taskID
* @param array $workhour
* @param object $workhour
* @access public
* @return array
*/
public function recordWorkhour(int $taskID, array $workhour)
public function recordWorkhour(int $taskID, object $workhour)
{
$workhour = fixer::input('post')->get();
$today = helper::today();
$today = helper::today();
a($workhour);die;
/* Fix bug#3036. */
foreach($workhour->consumed as $id => $item) $workhour->consumed[$id] = trim($item);
foreach($workhour->consumed as $id => $item)
@@ -2834,7 +2834,7 @@ class taskModel extends model
if($action == 'close' and $task->parent < 0) return false;
if($action == 'batchcreate' and !empty($task->team)) return false;
if($action == 'batchcreate' and $task->parent > 0) return false;
if($action == 'recordestimate' and $task->parent == -1) return false;
if($action == 'recordworkhour' and $task->parent == -1) return false;
if($action == 'delete' and $task->parent < 0) return false;
if(!empty($task->team))