From 09306de2e94f696aef67f1d5edd04319ce4d40be Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 1 Nov 2023 14:41:41 +0800 Subject: [PATCH] + Add mr 1.5 nav locate. --- module/execution/model.php | 4 ++++ module/execution/ui/ajaxgetdropmenudata.html.php | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index 15b9c453ad..75f2095320 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -2282,6 +2282,10 @@ class executionModel extends model { $link = helper::createLink('repo', 'review', "repoID=0&browseType=all&executionID=%s") . '#app=execution'; } + elseif($module == 'mr') + { + $link = helper::createLink('mr', 'browse', "repoID=0&mode=status¶m=opened&objectID=%s") . '#app=execution'; + } elseif($module == 'repo') { $link = helper::createLink('repo', 'browse', "repoID=0&branchID=&executionID=%s") . '#app=execution'; diff --git a/module/execution/ui/ajaxgetdropmenudata.html.php b/module/execution/ui/ajaxgetdropmenudata.html.php index 53ee5187bd..56e4fbb6c7 100644 --- a/module/execution/ui/ajaxgetdropmenudata.html.php +++ b/module/execution/ui/ajaxgetdropmenudata.html.php @@ -46,9 +46,10 @@ foreach($projectExecutions as $projectID => $executions) $group = $getExecutionGroup($execution); $item = array(); - $item['id'] = $execution->id; - $item['text'] = $execution->name; - $item['keys'] = zget(common::convert2Pinyin(array($execution->name)), $execution->name, ''); + $item['id'] = $execution->id; + $item['text'] = $execution->name; + $item['data-app'] = $app->tab; + $item['keys'] = zget(common::convert2Pinyin(array($execution->name)), $execution->name, ''); if(!isset($data[$group][$projectID])) $data[$group][$projectID] = $projectItem; $data[$group][$projectID]['items'][] = $item;