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

Merge branch '15.5' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.5

Browse Source
This commit is contained in:
liyuchun
2021-09-15 15:21:44 +08:00
parent 9c2cd403d7 5fe40b698b
commit 3c7139840f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/task.js
+1 -1
View File
@@ -9,7 +9,7 @@ $(function()
$td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60);
});
toggleFold('#projectTaskForm', unfoldTasks, executionID, 'project');
toggleFold('#executionTaskForm', unfoldTasks, executionID, 'project');
adjustTableFooter();
$('body').on('click', '#toggleFold', adjustTableFooter);
module/mr/model.php
+1 -1
View File
@@ -327,7 +327,7 @@ class mrModel extends model
$todo->assignedBy = $this->app->user->account;
$todo->date = date("Y-m-d", strtotime($rawTodo->target->created_at));
$todo->assignedDate = $rawTodo->target->created_at;
$todo->begin = ceil(date("Hi", strtotime($rawTodo->target->created_at))/10)*10;
$todo->begin = '2400'; /* 2400 means begin is 'undefined'. */;
$todo->end = '2400'; /* 2400 means end is 'undefined'. */
$todo->type = 'custom';
$todo->idvalue = $rawTodo->id;