Page MenuHomestyx hydra
Files F1457388

No OneTemporary
Actions

View Options

diff --git a/src/applications/diffusion/controller/DiffusionBranchTableController.php b/src/applications/diffusion/controller/DiffusionBranchTableController.php
index 5211b3ad75..049be12b88 100644
--- a/src/applications/diffusion/controller/DiffusionBranchTableController.php
+++ b/src/applications/diffusion/controller/DiffusionBranchTableController.php
@@ -1,76 +1,74 @@
<?php
final class DiffusionBranchTableController extends DiffusionController {
public function shouldAllowPublic() {
return true;
}
public function processRequest() {
$drequest = $this->getDiffusionRequest();
$request = $this->getRequest();
- $user = $request->getUser();
+ $viewer = $request->getUser();
$repository = $drequest->getRepository();
$pager = new AphrontPagerView();
$pager->setURI($request->getRequestURI(), 'offset');
$pager->setOffset($request->getInt('offset'));
// TODO: Add support for branches that contain commit
$branches = DiffusionBranchInformation::newFromConduit(
$this->callConduitWithDiffusionRequest(
'diffusion.branchquery',
array(
'offset' => $pager->getOffset(),
'limit' => $pager->getPageSize() + 1
)));
$branches = $pager->sliceResults($branches);
$content = null;
if (!$branches) {
- $content = new AphrontErrorView();
- $content->setTitle(pht('No Branches'));
- $content->appendChild(pht('This repository has no branches.'));
- $content->setSeverity(AphrontErrorView::SEVERITY_NODATA);
+ $content = $this->renderStatusMessage(
+ pht('No Branches'),
+ pht('This repository has no branches.'));
} else {
- $commits = id(new PhabricatorAuditCommitQuery())
- ->withIdentifiers(
- $drequest->getRepository()->getID(),
- mpull($branches, 'getHeadCommitIdentifier'))
- ->needCommitData(true)
+ $commits = id(new DiffusionCommitQuery())
+ ->setViewer($viewer)
+ ->withIdentifiers(mpull($branches, 'getHeadCommitIdentifier'))
+ ->withRepositoryIDs(array($repository->getID()))
->execute();
$view = id(new DiffusionBranchTableView())
+ ->setUser($viewer)
->setBranches($branches)
- ->setUser($user)
->setCommits($commits)
->setDiffusionRequest($drequest);
$panel = id(new AphrontPanelView())
->setNoBackground(true)
->appendChild($view)
->appendChild($pager);
$content = $panel;
}
$crumbs = $this->buildCrumbs(
array(
'branches' => true,
));
return $this->buildApplicationPage(
array(
$crumbs,
$content,
),
array(
'title' => array(
- 'Branches',
- $repository->getCallsign().' Repository',
+ pht('Branches'),
+ 'r'.$repository->getCallsign(),
),
));
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 15, 7:26 PM (11 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
338352
Default Alt Text
(2 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)