- approvalStatus != 'approved' or ($MR->compileID !=0 and $MR->compileStatus != 'success')) ? ' disabled' : ''; ?>
+ approvalStatus != 'approved' or ($MR->compileID != 0 and $MR->compileStatus != 'success')) ? ' disabled' : ''; ?>
state == 'opened' and !$rawMR->has_conflicts) common::printIcon('mr', 'accept', "mr=$MR->id", $MR, 'button', 'flow', 'hiddenwin', 'mergeButton btn', false, $acceptDisabled, $lang->mr->acceptMR);?>
state == 'opened'): ?>
- has_conflicts or ($MR->compileID !=0 and $MR->compileStatus != 'success') or $MR->approvalStatus == 'approved'):?>
+ has_conflicts or ($MR->compileID != 0 and $MR->compileStatus != 'success') or $MR->approvalStatus == 'approved'):?>
id&action=approve", $MR, 'button', 'ok', 'hiddenwin', 'mergeButton', true, 'disabled', $lang->mr->approve);?>
id&action=approve", $MR, 'button', 'ok', 'hiddenwin', 'mergeButton btn iframe showinonlybody', true, '', $lang->mr->approve);?>
diff --git a/module/repo/control.php b/module/repo/control.php
index f021d47d62..7875d8b64a 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -1177,4 +1177,24 @@ class repo extends control
echo html::select('product', array('') + $productPairs, key($productPairs), "class='form-control chosen'");
}
+ /**
+ * API: get repo by url.
+ *
+ * @param string $type gitlab
+ * @access public
+ * @return void
+ */
+ public function apiGetRepoByUrl()
+ {
+ $url = urldecode($this->post->repoUrl);
+ $result = $this->repo->getRepoByUrl($url);
+ if($result['result'] == 'fail') return $this->send($result);
+
+ $repo = $result['data'];
+ $fileServer = new stdclass();
+ $fileServer->fileServerUrl = $repo->fileServerUrl;
+ $fileServer->fileServerAccount = $repo->fileServerAccount;
+ $fileServer->fileServerPassword = $repo->fileServerPassword;
+ return $this->send($fileServer);
+ }
}
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index e5fa02bbc2..75d213ae5e 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -24,6 +24,7 @@ $lang->repo->repo = 'Repository';
$lang->repo->parent = 'Parent File';
$lang->repo->branch = 'Branch';
$lang->repo->addWebHook = 'Add Webhook';
+$lang->repo->apiGetRepoByUrl = 'API: Get repo by URL';
$lang->repo->browseAction = 'Browse Repo';
$lang->repo->createAction = 'Create Repo';
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index 5283beb6f4..301470e473 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -24,6 +24,7 @@ $lang->repo->repo = '代码库';
$lang->repo->parent = '父文件夹';
$lang->repo->branch = '分支';
$lang->repo->addWebHook = '添加Webhook';
+$lang->repo->apiGetRepoByUrl = '接口：通过URL获取版本库';
$lang->repo->browseAction = '浏览版本库';
$lang->repo->createAction = '创建版本库';
diff --git a/module/repo/model.php b/module/repo/model.php
index a69ce07eab..df9beb7264 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -396,6 +396,76 @@ class repoModel extends model
return $repo;
}
+ /**
+ * Get repo by url.
+ *
+ * @param string $url
+ * @access public
+ * @return array
+ */
+ public function getRepoByUrl($url)
+ {
+ if(empty($url)) return array('result' => 'fail', 'message' => 'Url is empty.');
+
+ $parsedUrl = parse_url($url);
+
+ $isSSH = $parsedUrl['scheme'] == 'ssh';
+ $baseURL = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . (isset($parsedUrl['port']) ? ":{$parsedUrl['port']}" : '');
+
+ /* Get gitlabs by URL. */
+ $gitlabs = $this->dao->select('*')->from(TABLE_PIPELINE)->where('type')->eq('gitlab')
+ ->beginIF($isSSH)->andWhere('url')->like("%{$parsedUrl['host']}%")->fi()
+ ->beginIF(!$isSSH)->andWhere('url')->eq($baseURL)->fi()
+ ->orderBy('id_desc')
+ ->fetchAll('id');
+
+ /* Convert to id by url. */
+ $this->loadModel('gitlab');
+ $matched = new stdclass();
+ $matched->gitlab = 0;
+ $matched->project = 0;
+ foreach($gitlabs as $gitlabID => $gitlab)
+ {
+ $projects = $this->gitlab->apiGetProjects($gitlabID);
+ foreach($projects as $project)
+ {
+ if((!$isSSH and $project->http_url_to_repo == $url) or ($isSSH and $project->ssh_url_to_repo == $url))
+ {
+ $matched->gitlab = $gitlabID;
+ $matched->project = $project->id;
+ break;
+ }
+ }
+ }
+ if(empty($matched->gitlab) or empty($matched->project)) return array('result' => 'fail', 'message' => 'No matched gitlab.');
+
+ $matchedRepos = $this->dao->select('*')->from(TABLE_REPO)->where('SCM')->eq('Gitlab')
+ ->andWhere('client')->eq($matched->gitlab)
+ ->andWhere('path')->eq($matched->project)
+ ->andWhere('deleted')->eq('0')
+ ->orderBy('id_desc')
+ ->fetchAll();
+ if(empty($matchedRepos)) return array('result' => 'fail', 'message' => 'No matched gitlab.');
+
+ $matchedRepo = '';
+ foreach($matchedRepos as $repo)
+ {
+ if(!empty($repo->preMerge))
+ {
+ $matchedRepo = $repo;
+ break;
+ }
+ }
+ if(empty($matchedRepo)) return array('result' => 'fail', 'message' => 'Matched gitlab is not open pre merge.');
+ if(empty($matchedRepo->job)) return array('result' => 'fail', 'message' => 'No linked job.');
+
+ $job = $this->dao->select('*')->from(TABLE_JOB)->where('id')->eq($matchedRepo->job)->andWhere('deleted')->eq(0)->fetch();
+ if(empty($job)) return array('result' => 'fail', 'message' => 'Linked job is not exists.');
+
+ $matchedRepo->job = $job;
+ return array('result' => 'success', 'data' => $matchedRepo);
+ }
+
/**
* Get by id list.
*