Page MenuHomestyx hydra
Files F206822

No OneTemporary
Actions

View Options

diff --git a/src/applications/owners/controller/base/PhabricatorOwnersController.php b/src/applications/owners/controller/base/PhabricatorOwnersController.php
index 8202a1dc78..7f643ed1ea 100644
--- a/src/applications/owners/controller/base/PhabricatorOwnersController.php
+++ b/src/applications/owners/controller/base/PhabricatorOwnersController.php
@@ -1,108 +1,100 @@
<?php
/*
* Copyright 2012 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
abstract class PhabricatorOwnersController extends PhabricatorController {
private $filter;
private function getSideNavFilter() {
return $this->filter;
}
protected function setSideNavFilter($filter) {
$this->filter = $filter;
return $this;
}
public function buildStandardPageResponse($view, array $data) {
$page = $this->buildStandardPageView();
$page->setApplicationName('Owners');
$page->setBaseURI('/owners/');
$page->setTitle(idx($data, 'title'));
$page->setGlyph("\xE2\x98\x81");
$nav = $this->renderSideNav();
$nav->appendChild($view);
$page->appendChild($nav);
$doclink =
PhabricatorEnv::getDoclink('article/Owners_Tool_User_Guide.html');
$tabs = array(
'help' => array(
'href' => $doclink,
'name' => 'Help',
),
);
$page->setTabs($tabs, null);
$response = new AphrontWebpageResponse();
return $response->setContent($page->render());
}
public function renderSideNav() {
$package_views = array(
array('name' => 'Owned',
'key' => 'view/owned'),
array('name' => 'All',
'key' => 'view/all'),
);
$package_views =
array_merge($this->getExtraPackageViews(),
$package_views);
$base_uri = new PhutilURI('/owners/');
-
$nav = new AphrontSideNavFilterView();
$nav->setBaseUri($base_uri);
+
$nav->addLabel('Packages');
- foreach ($package_views as $view) {
- $nav->addFilter($view['key'], $view['name']);
- }
+ $nav->addFilters($package_views);
+
$nav->addSpacer();
$nav->addLabel('Related Commits');
$related_views = $this->getRelatedViews();
- foreach ($related_views as $view) {
- $href = clone $base_uri;
- $href->setPath($href->getPath().$view['key']);
- $href = (string)$href;
- $nav->addFilter($view['key'],
- $view['name'],
- $href);
- }
+ $nav->addFilters($related_views);
$filter = $this->getSideNavFilter();
$nav->selectFilter($filter, 'view/owned');
return $nav;
}
protected function getExtraPackageViews() {
return array();
}
protected function getRelatedViews() {
$related_views = array(
array('name' => 'Related to Package',
'key' => 'related/view/all'),
array('name' => 'Needs Attention',
'key' => 'related/view/audit')
);
return $related_views;
}
}
diff --git a/src/applications/owners/controller/relatedlist/PhabricatorOwnerRelatedListController.php b/src/applications/owners/controller/relatedlist/PhabricatorOwnerRelatedListController.php
index 4cd270b137..29639e2a53 100644
--- a/src/applications/owners/controller/relatedlist/PhabricatorOwnerRelatedListController.php
+++ b/src/applications/owners/controller/relatedlist/PhabricatorOwnerRelatedListController.php
@@ -1,338 +1,339 @@
<?php
/*
* Copyright 2012 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class PhabricatorOwnerRelatedListController
extends PhabricatorOwnersController {
private $request;
private $user;
private $view;
private $packagePHID;
private $auditStatus;
public function willProcessRequest(array $data) {
$this->view = idx($data, 'view', 'all');
}
public function processRequest() {
$this->request = $this->getRequest();
if ($this->request->isFormPost()) {
$package_phids = $this->request->getArr('search_packages');
$package_phid = head($package_phids);
$status = $this->request->getStr('search_status');
return id(new AphrontRedirectResponse())
->setURI(
$this->request
->getRequestURI()
->alter('phid', $package_phid)
->alter('status', $status));
}
$this->user = $this->request->getUser();
$this->packagePHID = nonempty($this->request->getStr('phid'), null);
$this->auditStatus = $this->request->getStr('status', 'needaudit');
$search_view = $this->renderSearchView();
$list_panel = $this->renderListPanel();
- $side_nav_filter = 'related/view/'.$this->view.$this->getQueryString();
+ $side_nav_filter = 'related/view/'.$this->view;
$this->setSideNavFilter($side_nav_filter);
return $this->buildStandardPageResponse(
array(
$search_view,
- $list_panel
+ $list_panel,
),
array(
'title' => 'Related Commits',
));
}
protected function getRelatedViews() {
$related_views = parent::getRelatedViews();
if ($this->packagePHID) {
$query = $this->getQueryString();
foreach ($related_views as &$view) {
- $view['key'] = $view['key'].$query;
+ $view['uri'] = $view['key'].$query;
+ $view['relative'] = true;
}
}
return $related_views;
}
private function getQueryString() {
$query = null;
if ($this->packagePHID) {
$query = '/?phid=' . $this->packagePHID;
}
return $query;
}
private function renderListPanel() {
if (!$this->packagePHID) {
return id(new AphrontErrorView())
->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
->setTitle('No package selected. Please select one from above.');
}
$package = id(new PhabricatorOwnersPackage())->loadOneWhere(
"phid = %s",
$this->packagePHID);
if ($this->view === 'audit' && !$package->getAuditingEnabled()) {
return id(new AphrontErrorView())
->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
->setTitle("Package doesn't have auditing enabled. ".
"Please choose another one.");
}
$conn_r = id(new PhabricatorOwnersPackageCommitRelationship())
->establishConnection('r');
$status_arr = $this->getStatusArr();
$offset = $this->request->getInt('offset', 0);
$pager = new AphrontPagerView();
$pager->setPageSize(50);
$pager->setOffset($offset);
$pager->setURI($this->request->getRequestURI(), 'offset');
$data = queryfx_all(
$conn_r,
'SELECT commitPHID, auditStatus, auditReasons FROM %T
WHERE packagePHID = %s AND auditStatus in (%Ls)
ORDER BY id DESC
LIMIT %d, %d',
id(new PhabricatorOwnersPackageCommitRelationship())->getTableName(),
$package->getPHID(),
$status_arr,
$pager->getOffset(),
$pager->getPageSize() + 1);
$data = $pager->sliceResults($data);
$data = ipull($data, null, 'commitPHID');
$list_panel = $this->renderCommitTable($data, $package);
$list_panel->appendChild($pager);
return $list_panel;
}
private function getStatusArr() {
switch ($this->view) {
case 'all':
$status_arr =
array_keys(PhabricatorAuditStatusConstants::getStatusNameMap());
break;
case 'audit':
switch ($this->auditStatus) {
case 'needaudit':
$status_arr =
array(
PhabricatorAuditStatusConstants::AUDIT_REQUIRED,
PhabricatorAuditStatusConstants::CONCERNED,
);
break;
case 'accepted':
$status_arr =
array(
PhabricatorAuditStatusConstants::ACCEPTED,
);
break;
case 'all':
$status_arr =
array(
PhabricatorAuditStatusConstants::AUDIT_REQUIRED,
PhabricatorAuditStatusConstants::CONCERNED,
PhabricatorAuditStatusConstants::ACCEPTED,
);
break;
default:
throw new Exception("Status {$this->auditStatus} not recognized");
}
break;
default:
throw new Exception("view {$this->view} not recognized");
}
return $status_arr;
}
private function renderSearchView() {
if ($this->packagePHID) {
$loader = new PhabricatorObjectHandleData(array($this->packagePHID));
$handles = $loader->loadHandles();
$package_handle = $handles[$this->packagePHID];
$view_packages = array(
$this->packagePHID => $package_handle->getFullName(),
);
} else {
$view_packages = array();
}
$search_form = id(new AphrontFormView())
->setUser($this->user)
->appendChild(
id(new AphrontFormTokenizerControl())
->setDatasource('/typeahead/common/packages/')
->setLabel('Package')
->setName('search_packages')
->setValue($view_packages)
->setLimit(1));
if ($this->view === 'audit') {
$select_map = array(
'needaudit' => 'Needs Audit',
'accepted' => 'Accepted',
'all' => 'All',
);
$select = id(new AphrontFormSelectControl())
->setLabel('Audit Status')
->setName('search_status')
->setOptions($select_map)
->setValue($this->auditStatus);
$search_form->appendChild($select);
}
$search_form->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Search'));
$search_view = new AphrontListFilterView();
$search_view->appendChild($search_form);
return $search_view;
}
private function renderCommitTable($data, PhabricatorOwnersPackage $package) {
$commit_phids = array_keys($data);
$loader = new PhabricatorObjectHandleData($commit_phids);
$handles = $loader->loadHandles();
$objects = $loader->loadObjects();
$owners = id(new PhabricatorOwnersOwner())->loadAllWhere(
'packageID = %d',
$package->getID());
$owners_phids = mpull($owners, 'getUserPHID');
if ($this->user->getIsAdmin() ||
in_array($this->user->getPHID(), $owners_phids)) {
$allowed_to_audit = true;
} else {
$allowed_to_audit = false;
}
$rows = array();
foreach ($commit_phids as $commit_phid) {
$handle = $handles[$commit_phid];
$object = $objects[$commit_phid];
$commit_data = $object->getCommitData();
$epoch = $handle->getTimeStamp();
$date = phabricator_date($epoch, $this->user);
$time = phabricator_time($epoch, $this->user);
$link = phutil_render_tag(
'a',
array(
'href' => $handle->getURI(),
),
phutil_escape_html($handle->getName()));
$row = array(
$link,
$date,
$time,
phutil_escape_html($commit_data->getSummary()),
);
if ($this->view === 'audit') {
$relationship = $data[$commit_phid];
$status_link = phutil_escape_html(
idx(PhabricatorAuditStatusConstants::getStatusNameMap(),
$relationship['auditStatus']));
if ($allowed_to_audit)
$status_link = phutil_render_tag(
'a',
array(
'href' => sprintf('/audit/edit/?c-phid=%s&p-phid=%s',
idx($relationship, 'commitPHID'),
$this->packagePHID),
),
$status_link);
$reasons = json_decode($relationship['auditReasons'], true);
$reasons = array_map('phutil_escape_html', $reasons);
$reasons = implode($reasons, '<br>');
$row = array_merge(
$row,
array(
$status_link,
$reasons,
));
}
$rows[] = $row;
}
$commit_table = new AphrontTableView($rows);
$headers = array(
'Commit',
'Date',
'Time',
'Summary',
);
if ($this->view === 'audit') {
$headers = array_merge(
$headers,
array(
'Audit Status',
'Audit Reasons',
));
}
$commit_table->setHeaders($headers);
$column_classes =
array(
'',
'',
'right',
'wide',
);
if ($this->view === 'audit') {
$column_classes = array_merge(
$column_classes,
array(
'',
'',
));
}
$commit_table->setColumnClasses($column_classes);
$list_panel = new AphrontPanelView();
$list_panel->setHeader('Commits Related to package "'.
phutil_render_tag(
'a',
array(
'href' => '/owners/package/'.$package->getID().'/',
),
phutil_escape_html($package->getName())).
'"'.
($this->view === 'audit' ? ' and need attention' : ''));
$list_panel->appendChild($commit_table);
return $list_panel;
}
}
diff --git a/src/view/layout/sidenavfilter/AphrontSideNavFilterView.php b/src/view/layout/sidenavfilter/AphrontSideNavFilterView.php
index b7febf5be6..5b28c76fa9 100644
--- a/src/view/layout/sidenavfilter/AphrontSideNavFilterView.php
+++ b/src/view/layout/sidenavfilter/AphrontSideNavFilterView.php
@@ -1,132 +1,155 @@
<?php
/*
* Copyright 2012 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Like an @{class:AphrontSideNavView}, but with a little bit of logic for the
* common case where you're using the side nav to filter some view of objects.
*
* For example:
*
* $nav = new AphrontSideNavFilterView();
* $nav
* ->setBaseURI($some_uri)
* ->addLabel('Cats')
* ->addFilter('meow', 'Meow')
* ->addFilter('purr', 'Purr')
* ->addSpacer()
* ->addLabel('Dogs')
* ->addFilter('woof', 'Woof')
* ->addFilter('bark', 'Bark');
* $valid_filter = $nav->selectFilter($user_selection, $default = 'meow');
*
*/
final class AphrontSideNavFilterView extends AphrontView {
private $items = array();
private $baseURI;
private $selectedFilter = false;
- public function addFilter($key, $name, $uri = null) {
- $this->items[] = array('filter', $key, $name, 'uri' => $uri);
+ public function addFilter($key, $name, $uri = null, $relative = false) {
+ $this->items[] = array(
+ 'filter', $key, $name, 'uri' => $uri, 'relative' => $relative);
return $this;
}
+ public function addFilters(array $views) {
+ foreach ($views as $view) {
+ $uri = isset($view['uri']) ? $view['uri'] : null;
+ $relative = isset($view['relative']) ? $view['relative'] : false;
+ $this->addFilter(
+ $view['key'],
+ $view['name'],
+ $uri,
+ $relative);
+ }
+ }
+
public function addLabel($name) {
$this->items[] = array('label', null, $name);
return $this;
}
public function addSpacer() {
$this->items[] = array('spacer', null, null);
return $this;
}
public function setBaseURI(PhutilURI $uri) {
$this->baseURI = $uri;
return $this;
}
+ public function getBaseURI() {
+ return $this->baseURI;
+ }
+
public function selectFilter($key, $default) {
$this->selectedFilter = $default;
if ($key !== null) {
foreach ($this->items as $item) {
if ($item[0] == 'filter') {
if ($item[1] == $key) {
$this->selectedFilter = $key;
break;
}
}
}
}
return $this->selectedFilter;
}
public function render() {
if (!$this->baseURI) {
throw new Exception("Call setBaseURI() before render()!");
}
if ($this->selectedFilter === false) {
throw new Exception("Call selectFilter() before render()!");
}
$view = new AphrontSideNavView();
foreach ($this->items as $item) {
list($type, $key, $name) = $item;
switch ($type) {
case 'spacer':
$view->addNavItem('<br />');
break;
case 'label':
$view->addNavItem(
phutil_render_tag(
'span',
array(),
phutil_escape_html($name)));
break;
case 'filter':
$class = ($key == $this->selectedFilter)
? 'aphront-side-nav-selected'
: null;
if (empty($item['uri'])) {
$href = clone $this->baseURI;
$href->setPath($href->getPath().$key.'/');
$href = (string)$href;
} else {
- $href = $item['uri'];
+ if (empty($item['relative'])) {
+ $href = $item['uri'];
+ } else {
+ $href = clone $this->baseURI;
+ $href->setPath($href->getPath().$item['uri']);
+ $href = (string)$href;
+ }
}
$view->addNavItem(
phutil_render_tag(
'a',
array(
'href' => $href,
'class' => $class,
),
phutil_escape_html($name)));
break;
default:
throw new Exception("Unknown item type '{$type}'.");
}
}
$view->appendChild($this->renderChildren());
return $view->render();
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jul 1, 3:40 PM (14 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
164423
Default Alt Text
(18 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!)