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

Merge branch 'sprint/devops16' into 'sprint/devops16_45500'

Browse Source 
# Conflicts:
#   module/gitlab/control.php
This commit is contained in:
李玉春
2021-12-07 08:54:25 +00:00
parent b4685be3de ae3fea2f3a
commit bb44039a30
14 changed files with 162 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/control.php
+33
View File
@@ -758,6 +758,39 @@ class gitlab extends control
$this->display();
}
/**
* Creat a gitlab branch.
*
* @param int $gitlabID
* @param int $projectID
* @access public
* @return void
*/
public function createBranch($gitlabID, $projectID)
{
if($_POST)
{
$this->gitlab->createBranch($gitlabID, $projectID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$locate = $this->session->gitlabBranchList ? $this->session->gitlabBranchList : inlink('browseBranch', "gitlibID=$gitlabID&projectID=$projectID");
return $this->send(array('result' => 'success', 'message' => $this->lang->gitlab->createSuccess, 'locate' => $locate));
}
/* Get branches by api. */
$branches = $this->gitlab->apiGetBranches($gitlabID, $projectID);
if(!is_array($branches)) $branches= array();
$branchPairs = array();
foreach($branches as $branch) $branchPairs[$branch->name] = $branch->name;
$this->view->title = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->createBranch;
$this->view->gitlabID = $gitlabID;
$this->view->projectID = $projectID;
$this->view->branchPairs = $branchPairs;
$this->display();
}
/**
* Import gitlab issue to zentaopms.
*