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

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

Browse Source
This commit is contained in:
tianshujie
2021-09-15 15:56:33 +08:00
parent 441cda176d 3c7139840f
commit caaaa90cf5
8 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/js/edit.js
+1 -1
View File
@@ -6,7 +6,7 @@ $(function()
{
$('#content').html(draft);
editor = KindEditor.instances[0];
editor.html(draft);
editor.html('' + draft);
$('.kindeditor-ph').remove();
}
}, 100)
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 = date("Hi", strtotime($rawTodo->target->created_at));
$todo->begin = '2400'; /* 2400 means begin is 'undefined'. */;
$todo->end = '2400'; /* 2400 means end is 'undefined'. */
$todo->type = 'custom';
$todo->idvalue = $rawTodo->id;
module/product/model.php
+5 -1
View File
@@ -1592,7 +1592,11 @@ class productModel extends model
$hourList = $this->loadModel('project')->computerProgress($latestExecutionList);
$releaseList = $this->dao->select('id,product,name,marker')->from(TABLE_RELEASE)->where('product')->in(array_keys($productList))->fetchGroup('product', 'id');
$releaseList = $this->dao->select('id,product,name,marker')->from(TABLE_RELEASE)
->where('product')->in(array_keys($productList))
->andWhere('deleted')->eq('0')
->andWhere('status')->eq('normal')
->fetchGroup('product', 'id');
return array('programList' => $programList, 'productList' => $productList, 'planList' => $planList, 'projectList' => $projectList, 'executionList' => $executionList, 'projectProduct' => $projectProduct, 'projectLatestExecutions' => $projectLatestExecutions, 'hourList' => $hourList, 'releaseList' => $releaseList);
}
module/project/model.php
+8
View File
@@ -1017,6 +1017,14 @@ class projectModel extends model
if($oldProject->parent != $project->parent) $this->loadModel('program')->processNode($projectID, $project->parent, $oldProject->path, $oldProject->grade);
/* Fix whitelist changes. */
$oldWhitelist = explode(',', $oldProject->whitelist) and $oldWhitelist = array_filter($oldWhitelist);
$newWhitelist = explode(',', $project->whitelist) and $newWhitelist = array_filter($newWhitelist);
if(count($oldWhitelist) == count($newWhitelist) and count(array_diff($oldWhitelist, $newWhitelist)) == 0) unset($project->whitelist);
/* Add linkedproducts changes. */
$oldProject->linkedProducts = implode(',', $linkedProducts);
$project->linkedProducts = implode(',', $_POST['products']);
return common::createChanges($oldProject, $project);
}
}
module/task/control.php
+2 -2
View File
@@ -389,9 +389,9 @@ class task extends control
$task = $this->task->getById($taskID);
if($this->post->comment != '' or !empty($changes) or !empty($files))
{
$action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
$action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
$fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : '';
$actionID = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment);
$actionID = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment);
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
}
module/task/model.php
+2 -3
View File
@@ -848,8 +848,7 @@ class taskModel extends model
$now = helper::now();
$task = fixer::input('post')
->setDefault('story, estimate, left, consumed', 0)
->setDefault('estStarted', '0000-00-00')
->setDefault('deadline', '0000-00-00')
->setDefault('realStarted', '0000-00-00 00:00:00')
->setIF(is_numeric($this->post->estimate), 'estimate', (float)$this->post->estimate)
->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed)
->setIF(is_numeric($this->post->left), 'left', (float)$this->post->left)
@@ -1922,7 +1921,7 @@ class taskModel extends model
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((strpos($key, 'Date') !== false or strpos('estStarted|deadline', $key) !== false) and !(int)substr($value, 0, 4)) $task->$key = '';
}
$task->files = $this->loadModel('file')->getByObject('task', $taskID);
module/task/view/edit.html.php
+2 -2
View File
@@ -176,11 +176,11 @@
<table class='table table-form'>
<tr>
<th class='thWidth'><?php echo $lang->task->estStarted;?></th>
<td><?php echo html::input('estStarted', helper::isZeroDate($task->estStarted) ? '' : $task->estStarted, "class='form-control form-date'");?></td>
<td><?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->task->deadline;?></th>
<td><?php echo html::input('deadline', helper::isZeroDate($task->deadline) ? '' : $task->deadline, "class='form-control form-date'");?></td>
<td><?php echo html::input('deadline', $task->deadline, "class='form-control form-date'");?></td>
</tr>
<tr>
<th><?php echo $lang->task->estimate;?></th>