diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 9328ab23e1..adadfb9371 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -726,6 +726,8 @@ class gitlab extends control */ public function browseBranch($gitlabID, $projectID, $orderBy = 'name_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1) { + $this->session->set('gitlabBranchList', $this->app->getURI(true)); + $branchList = array(); $result = $this->gitlab->apiGetBranches($gitlabID, $projectID); foreach($result as $gitlabBranch) diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index 7256b7fa31..f177bdcf0a 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -38,7 +38,6 @@ $lang->gitlab->manageProjectMembers = 'Manage project member'; $lang->gitlab->createProject = 'Create GitLab project'; $lang->gitlab->editProject = 'Eidt GitLab project'; $lang->gitlab->deleteProject = 'Delete GitLab project'; -$lang->gitlab->createBranch = 'Create Branch'; $lang->gitlab->createGroup = 'Create group'; $lang->gitlab->editGroup = 'Edit group'; $lang->gitlab->deleteGroup = 'Delete group'; @@ -63,10 +62,6 @@ $lang->gitlab->tips = 'When using a password, please disable the "Preve $lang->gitlab->emptyError = "cannot be empty"; $lang->gitlab->createSuccess = "Create success"; -$lang->gitlab->branchName = 'Branch Name'; -$lang->gitlab->branchLastCommitter = 'Last Committer'; -$lang->gitlab->branchLastCommittedDate = 'Last Committed Date'; - $lang->gitlab->placeholder = new stdclass; $lang->gitlab->placeholder->name = ''; $lang->gitlab->placeholder->url = "Please fill in the access address of the GitLab Server homepage, as: https://gitlab.zentao.net."; @@ -184,6 +179,8 @@ $lang->gitlab->group->memberExpiresAt = 'Expiration time $lang->gitlab->group->repeatError = "Group members cannot be added repeatedly"; $lang->gitlab->branch = new stdclass(); -$lang->gitlab->branch->name = 'Branch Name'; -$lang->gitlab->branch->from = 'Create from'; -$lang->gitlab->branch->create = 'Create'; +$lang->gitlab->branch->name = 'Branch Name'; +$lang->gitlab->branch->from = 'Create from'; +$lang->gitlab->branch->create = 'Create'; +$lang->gitlab->branch->lastCommitter = 'Last Committer'; +$lang->gitlab->branch->lastCommittedDate = 'Last Committed Date'; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index e31ee44d32..74eb3afd9d 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -38,7 +38,6 @@ $lang->gitlab->manageProjectMembers = '项目成员管理'; $lang->gitlab->createProject = '添加GitLab项目'; $lang->gitlab->editProject = '编辑GitLab项目'; $lang->gitlab->deleteProject = '删除GitLab项目'; -$lang->gitlab->createBranch = '添加分支'; $lang->gitlab->createGroup = '添加群组'; $lang->gitlab->editGroup = '编辑群组'; $lang->gitlab->deleteGroup = '删除群组'; @@ -63,10 +62,6 @@ $lang->gitlab->tips = '使用密码时,请在GitLab全局安全设置 $lang->gitlab->emptyError = "不能为空"; $lang->gitlab->createSuccess = "创建成功"; -$lang->gitlab->branchName = '分支名'; -$lang->gitlab->branchLastCommitter = '最后提交'; -$lang->gitlab->branchLastCommittedDate = '最后修改时间'; - $lang->gitlab->placeholder = new stdclass; $lang->gitlab->placeholder->name = ''; $lang->gitlab->placeholder->url = "请填写GitLab Server首页的访问地址,如:https://gitlab.zentao.net。"; @@ -184,6 +179,8 @@ $lang->gitlab->group->memberExpiresAt = '过期时间'; $lang->gitlab->group->repeatError = "群组成员不能重复添加"; $lang->gitlab->branch = new stdclass(); -$lang->gitlab->branch->name = '分支名'; -$lang->gitlab->branch->from = '创建自'; -$lang->gitlab->branch->create = '创建'; +$lang->gitlab->branch->name = '分支名'; +$lang->gitlab->branch->from = '创建自'; +$lang->gitlab->branch->create = '创建'; +$lang->gitlab->branch->lastCommitter = '最后提交'; +$lang->gitlab->branch->lastCommittedDate = '最后修改时间'; diff --git a/module/gitlab/view/browsebranch.html.php b/module/gitlab/view/browsebranch.html.php index 701be26458..88e176b95b 100644 --- a/module/gitlab/view/browsebranch.html.php +++ b/module/gitlab/view/browsebranch.html.php @@ -18,7 +18,7 @@ ' . $lang->goback, '', 'btn btn-secondary');?>
- " . $lang->gitlab->createBranch, '', "class='btn btn-primary'");?> + " . $lang->gitlab->createBranch, '', "class='btn btn-primary'");?>
@@ -37,9 +37,9 @@ recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> - gitlab->branchName);?> - gitlab->branchLastCommitter;?> - gitlab->branchLastCommittedDate);?> + gitlab->branch->name);?> + gitlab->branch->lastCommitter;?> + gitlab->branch->lastCommittedDate);?> actions;?>