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

+ [task#144536] add pullreq type in audit page.

Browse Source
This commit is contained in:
liyang
2025-06-24 16:03:59 +08:00
parent 25488a8ed1
commit 080c069084
3 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/js/audit.ui.js
+2 -2
View File
@@ -16,9 +16,9 @@ window.onRenderCell = function(result, {row, col})
link = oaReviewLink.replace('{module}', row.data.module);
delete result[0].props.items[0]['data-toggle'];
}
else if(row.data.module == 'mr')
else if(['mr', 'pullreq'].includes(row.data.module))
{
link = $.createLink('mr', 'view', 'id=' + row.data.id);
link = $.createLink(row.data.module, 'view', 'id=' + row.data.id);
result[0].props.items[0]['disabled'] = viewPrivs[row.data.module];
delete result[0].props.items[0]['data-toggle'];
}
module/my/model.php
+1 -15
View File
@@ -1163,7 +1163,7 @@ class myModel extends model
*/
public function getReviewingMRs(string $orderBy = 'id_desc'): array
{
$mrList = $this->dao->select('*')->from(TABLE_MR)
return $this->dao->select("id, title, if(isFlow='1', 'pullreq', 'mr') as type, createdDate as time, approvalStatus as status, 0 as product, 0 as project")->from(TABLE_MR)
->where('deleted')->eq('0')
->andWhere('approvalStatus')->notIn(array('approved', 'rejected'))
->andWhere('status')->ne('closed')
@@ -1171,20 +1171,6 @@ class myModel extends model
->orderBy($orderBy)
->fetchAll('id');
$mrs = array();
foreach($mrList as $mr)
{
$reviewMR = new stdclass();
$reviewMR->id = $mr->id;
$reviewMR->title = $mr->title;
$reviewMR->type = empty($mr->isFlow) ? 'mr' : 'pullreq';
$reviewMR->time = $mr->createdDate;
$reviewMR->status = $mr->approvalStatus;
$reviewMR->product = 0;
$reviewMR->project = 0;
$mrs[] = $reviewMR;
}
return $mrs;
}
module/my/ui/audit.html.php
+8 -5
View File
@@ -28,11 +28,14 @@ foreach(array_keys($lang->my->featureBar['audit']) as $type)
$viewPrivs[$type] = $viewPriv;
}
}
$reviewPrivs['review'] = hasPriv('review', 'access');
$reviewPrivs['mr'] = hasPriv('mr', 'view');
$viewPrivs['review'] = hasPriv('review', 'view');
$viewPrivs['task'] = hasPriv('task', 'view');
$viewPrivs['mr'] = hasPriv('mr', 'view');
$reviewPrivs['review'] = hasPriv('review', 'access');
$reviewPrivs['mr'] = hasPriv('mr', 'view');
$reviewPrivs['pullreq'] = hasPriv('pullreq', 'view');
$viewPrivs['review'] = hasPriv('review', 'view');
$viewPrivs['task'] = hasPriv('task', 'view');
$viewPrivs['mr'] = hasPriv('mr', 'view');
$viewPrivs['pullreq'] = hasPriv('pullreq', 'view');
jsVar('reviewLink', createLink('{module}', 'review', 'id={id}'));
jsVar('flowReviewLink', createLink('{module}', 'approvalreview', 'id={id}'));