diff --git a/module/my/js/audit.ui.js b/module/my/js/audit.ui.js index eca09dd054..86e960dabf 100644 --- a/module/my/js/audit.ui.js +++ b/module/my/js/audit.ui.js @@ -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']; } diff --git a/module/my/model.php b/module/my/model.php index f4d54ed0a8..9b2e5b4f62 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -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; } diff --git a/module/my/ui/audit.html.php b/module/my/ui/audit.html.php index 85c2fa3961..34f8674b14 100644 --- a/module/my/ui/audit.html.php +++ b/module/my/ui/audit.html.php @@ -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}'));