function merges_action() { $this->setBranch(); $merge = new \firegit\app\mod\git\Merge(); $merges = $merge->pagedGetMerges($this->_pn, $this->_sz, 1 | 2 | 4, $this->gitGroup, $this->gitName); $branches = $this->repo->listBranches(); $rmod = new \firegit\app\mod\git\Reposite(); $role = $rmod->getUser($this->gitGroup, $this->gitName, $this->getData('user')); $umod = new \firegit\app\mod\user\User(); $tusers = $umod->getUsers(); $this->setData('tusers', $tusers); $this->set(array('pageTitle' => '合并请求列表', 'total' => $merges['total'], 'merges' => $merges['list'], 'navType' => 'merge', 'branches' => $branches, 'notShowNav' => true, 'role' => $role))->setView('git/merges.phtml'); }
function showMerges($status, $subNav) { $merge = new \firegit\app\mod\git\Merge(); $merges = $merge->pagedGetMerges($this->_pn, $this->_sz, $status, null, null, 'merge_id'); $this->set(array('mainNav' => 'merge', 'subNav' => $subNav, 'total' => $merges['total'], 'merges' => $merges['list']))->setView('merge/index.phtml'); }