diff --git a/module/gitlab/config/dtable.php b/module/gitlab/config/dtable.php index d6e97caf02..52df96331a 100644 --- a/module/gitlab/config/dtable.php +++ b/module/gitlab/config/dtable.php @@ -206,6 +206,7 @@ $config->gitlab->dtable->branch->fieldList['lastCommitter']['type'] = 'text'; $config->gitlab->dtable->branch->fieldList['lastCommittedDate']['title'] = $lang->gitlab->branch->lastCommittedDate; $config->gitlab->dtable->branch->fieldList['lastCommittedDate']['type'] = 'text'; +$config->gitlab->dtable->branch->fieldList['lastCommittedDate']['sortType'] = true; $config->gitlab->dtable->tag = new stdclass(); $config->gitlab->dtable->tag->fieldList['name']['title'] = $lang->gitlab->branch->name; diff --git a/module/gitlab/control.php b/module/gitlab/control.php index 73750b070e..53b9cff4ec 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -381,7 +381,7 @@ class gitlab extends control { $this->gitlabZen->checkBindedUser($gitlabID); - $members = $this->gitlab->apiGetGroupMembers($gitlabID, $groupID, $openID); + $members = $this->gitlab->apiGetGroupMembers($gitlabID, $groupID, 0); if(empty($members) or $members[0]->access_level < $this->config->gitlab->accessLevel['owner']) return print(js::alert($this->lang->gitlab->noAccess) . js::locate($this->createLink('space', 'browse'))); } diff --git a/module/gitlab/ui/browsebranch.html.php b/module/gitlab/ui/browsebranch.html.php index c8340e4ecb..6508ae9aba 100644 --- a/module/gitlab/ui/browsebranch.html.php +++ b/module/gitlab/ui/browsebranch.html.php @@ -34,6 +34,7 @@ dtable ( set::cols($config->gitlab->dtable->branch->fieldList), set::data($branchList), - set::sortLink(createLink('gitlab', 'browseBranch', "gitlabID={$gitlabID}&projectID={$projectID}&orderBy={name}_{sortType}")), - set::orderBy($orderBy) + set::sortLink(createLink('gitlab', 'browseBranch', "gitlabID={$gitlabID}&projectID={$projectID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::orderBy($orderBy), + set::footPager(usePager()) ); diff --git a/module/gitlab/ui/editgroup.html.php b/module/gitlab/ui/editgroup.html.php index 5ae1c8f139..7d402bd882 100644 --- a/module/gitlab/ui/editgroup.html.php +++ b/module/gitlab/ui/editgroup.html.php @@ -24,6 +24,7 @@ formPanel ( set::title($lang->gitlab->group->edit), set::labelWidth($app->clientLang == 'zh-cn' ? '8em' : '13em'), + set::back('gitlab-browsegroup'), input ( set::type('hidden'), diff --git a/module/gitlab/ui/edituser.html.php b/module/gitlab/ui/edituser.html.php index 6fceba7a0d..53faa9cd31 100644 --- a/module/gitlab/ui/edituser.html.php +++ b/module/gitlab/ui/edituser.html.php @@ -13,6 +13,7 @@ namespace zin; formPanel ( set::title($lang->gitlab->user->edit), + set::back('gitlab-browseuser'), h::input ( set::name('id'),