No OneTemporary
Actions

Size

76 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/controller/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php
	index f02cd9138b..71bed2ea0b 100644
	--- a/src/applications/differential/controller/DifferentialRevisionListController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionListController.php
	@@ -1,490 +1,475 @@
	<?php

	final class DifferentialRevisionListController extends DifferentialController {

	private $filter;
	private $username;

	public function shouldRequireLogin() {
	return !$this->allowsAnonymousAccess();
	}

	public function willProcessRequest(array $data) {
	$this->filter = idx($data, 'filter');
	$this->username = idx($data, 'username');
	}

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();
	$viewer_is_anonymous = !$user->isLoggedIn();

	$params = array_filter(
	array(
	'status' => $request->getStr('status'),
	'order' => $request->getStr('order'),
	));

	$default_filter = ($viewer_is_anonymous ? 'all' : 'active');
	$filters = $this->getFilters();
	$this->filter = $this->selectFilter(
	$filters,
	$this->filter,
	$default_filter);

	// Redirect from search to canonical URL.
	$phid_arr = $request->getArr('view_user');
	if ($phid_arr) {
	$view_user = id(new PhabricatorUser())
	->loadOneWhere('phid = %s', head($phid_arr));

	$base_uri = '/differential/filter/'.$this->filter.'/';
	if ($view_user) {
	// This is a user, so generate a pretty URI.
	$uri = $base_uri.phutil_escape_uri($view_user->getUserName()).'/';
	} else {
	// We're assuming this is a mailing list, generate an ugly URI.
	$uri = $base_uri;
	$params['phid'] = head($phid_arr);
	}

	$uri = new PhutilURI($uri);
	$uri->setQueryParams($params);

	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	$uri = new PhutilURI('/differential/filter/'.$this->filter.'/');
	$uri->setQueryParams($params);

	$username = '';
	if ($this->username) {
	$view_user = id(new PhabricatorUser())
	->loadOneWhere('userName = %s', $this->username);
	if (!$view_user) {
	return new Aphront404Response();
	}
	$username = phutil_escape_uri($this->username).'/';
	$uri->setPath('/differential/filter/'.$this->filter.'/'.$username);
	$params['phid'] = $view_user->getPHID();
	} else {
	$phid = $request->getStr('phid');
	if (strlen($phid)) {
	$params['phid'] = $phid;
	}
	}

	// Fill in the defaults we'll actually use for calculations if any
	// parameters are missing.
	$params += array(
	'phid' => $user->getPHID(),
	'status' => 'all',
	'order' => 'modified',
	);

	- $side_nav = new AphrontSideNavView();
	+ $side_nav = new AphrontSideNavFilterView();
	+ $side_nav->setBaseURI(id(clone $uri)->setPath('/differential/filter/'));
	foreach ($filters as $filter) {
	list($filter_name, $display_name) = $filter;
	if ($filter_name) {
	- $href = clone $uri;
	- $href->setPath('/differential/filter/'.$filter_name.'/'.$username);
	- if ($filter_name == $this->filter) {
	- $class = 'aphront-side-nav-selected';
	- } else {
	- $class = null;
	- }
	- $item = phutil_render_tag(
	- 'a',
	- array(
	- 'href' => (string)$href,
	- 'class' => $class,
	- ),
	- phutil_escape_html($display_name));
	+ $side_nav->addFilter($filter_name.'/'.$username, $display_name);
	} else {
	- $item = phutil_render_tag(
	- 'span',
	- array(),
	- phutil_escape_html($display_name));
	+ $side_nav->addLabel($display_name);
	}
	- $side_nav->addNavItem($item);
	}
	+ $side_nav->selectFilter($this->filter.'/'.$username, null);

	$panels = array();
	$handles = array();
	$controls = $this->getFilterControls($this->filter);
	if ($this->getFilterRequiresUser($this->filter) && !$params['phid']) {
	// In the anonymous case, we still want to let you see some user's
	// list, but we don't have a default PHID to provide (normally, we use
	// the viewing user's). Show a warning instead.
	$warning = new AphrontErrorView();
	$warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$warning->setTitle('User Required');
	$warning->appendChild(
	'This filter requires that a user be specified above.');
	$panels[] = $warning;
	} else {
	$query = $this->buildQuery($this->filter, $params['phid']);

	$pager = null;
	if ($this->getFilterAllowsPaging($this->filter)) {
	$pager = new AphrontPagerView();
	$pager->setOffset($request->getInt('page'));
	$pager->setPageSize(1000);
	$pager->setURI($uri, 'page');

	$query->setOffset($pager->getOffset());
	$query->setLimit($pager->getPageSize() + 1);
	}

	foreach ($controls as $control) {
	$this->applyControlToQuery($control, $query, $params);
	}

	$revisions = $query->execute();

	if ($pager) {
	$revisions = $pager->sliceResults($revisions);
	}

	$views = $this->buildViews($this->filter, $params['phid'], $revisions);

	$view_objects = array();
	foreach ($views as $view) {
	if (empty($view['special'])) {
	$view_objects[] = $view['view'];
	}
	}
	$phids = array_mergev(mpull($view_objects, 'getRequiredHandlePHIDs'));
	$phids[] = $params['phid'];
	$handles = $this->loadViewerHandles($phids);

	foreach ($views as $view) {
	if (empty($view['special'])) {
	$view['view']->setHandles($handles);
	}
	$panel = new AphrontPanelView();
	$panel->setHeader($view['title']);
	$panel->appendChild($view['view']);
	if ($pager) {
	$panel->appendChild($pager);
	}
	$panels[] = $panel;
	}
	}

	$filter_form = id(new AphrontFormView())
	->setMethod('GET')
	->setAction('/differential/filter/'.$this->filter.'/')
	->setUser($user);
	foreach ($controls as $control) {
	$control_view = $this->renderControl($control, $handles, $uri, $params);
	$filter_form->appendChild($control_view);
	}
	$filter_form
	->addHiddenInput('status', $params['status'])
	->addHiddenInput('order', $params['order'])
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Filter Revisions'));

	$filter_view = new AphrontListFilterView();
	$filter_view->appendChild($filter_form);

	if (!$viewer_is_anonymous) {
	$create_uri = new PhutilURI('/differential/diff/create/');
	$filter_view->addButton(
	phutil_render_tag(
	'a',
	array(
	'href' => (string)$create_uri,
	'class' => 'green button',
	),
	'Create Revision'));
	}

	$side_nav->appendChild($filter_view);

	foreach ($panels as $panel) {
	$side_nav->appendChild($panel);
	}

	return $this->buildStandardPageResponse(
	$side_nav,
	array(
	'title' => 'Differential Home',
	));
	}

	private function getFilters() {
	return array(
	array(null, 'User Revisions'),
	array('active', 'Active'),
	array('revisions', 'Revisions'),
	array('reviews', 'Reviews'),
	array('subscribed', 'Subscribed'),
	array('drafts', 'Draft Reviews'),
	array(null, 'All Revisions'),
	array('all', 'All'),
	);
	}

	private function selectFilter(
	array $filters,
	$requested_filter,
	$default_filter) {

	// If the user requested a filter, make sure it actually exists.
	if ($requested_filter) {
	foreach ($filters as $filter) {
	if ($filter[0] === $requested_filter) {
	return $requested_filter;
	}
	}
	}

	// If not, return the default filter.
	return $default_filter;
	}

	private function getFilterRequiresUser($filter) {
	static $requires = array(
	'active' => true,
	'revisions' => true,
	'reviews' => true,
	'subscribed' => true,
	'drafts' => true,
	'all' => false,
	);
	if (!isset($requires[$filter])) {
	throw new Exception("Unknown filter '{$filter}'!");
	}
	return $requires[$filter];
	}

	private function getFilterAllowsPaging($filter) {
	static $allows = array(
	'active' => false,
	'revisions' => true,
	'reviews' => true,
	'subscribed' => true,
	'drafts' => true,
	'all' => true,
	);
	if (!isset($allows[$filter])) {
	throw new Exception("Unknown filter '{$filter}'!");
	}
	return $allows[$filter];
	}

	private function getFilterControls($filter) {
	static $controls = array(
	'active' => array('phid'),
	'revisions' => array('phid', 'status', 'order'),
	'reviews' => array('phid', 'status', 'order'),
	'subscribed' => array('subscriber', 'status', 'order'),
	'drafts' => array('phid', 'status', 'order'),
	'all' => array('status', 'order'),
	);
	if (!isset($controls[$filter])) {
	throw new Exception("Unknown filter '{$filter}'!");
	}
	return $controls[$filter];
	}

	private function buildQuery($filter, $user_phid) {
	$query = new DifferentialRevisionQuery();

	$query->needRelationships(true);

	switch ($filter) {
	case 'active':
	$query->withResponsibleUsers(array($user_phid));
	$query->withStatus(DifferentialRevisionQuery::STATUS_OPEN);
	$query->setLimit(null);
	break;
	case 'revisions':
	$query->withAuthors(array($user_phid));
	break;
	case 'reviews':
	$query->withReviewers(array($user_phid));
	break;
	case 'subscribed':
	$query->withSubscribers(array($user_phid));
	break;
	case 'drafts':
	$query->withDraftRepliesByAuthors(array($user_phid));
	break;
	case 'all':
	break;
	default:
	throw new Exception("Unknown filter '{$filter}'!");
	}
	return $query;
	}

	private function renderControl(
	$control,
	array $handles,
	PhutilURI $uri,
	array $params) {
	assert_instances_of($handles, 'PhabricatorObjectHandle');
	switch ($control) {
	case 'subscriber':
	case 'phid':
	$view_phid = $params['phid'];
	$value = array();
	if ($view_phid) {
	$value = array(
	$view_phid => $handles[$view_phid]->getFullName(),
	);
	}

	if ($control == 'subscriber') {
	$source = '/typeahead/common/allmailable/';
	$label = 'View Subscriber';
	} else {
	$source = '/typeahead/common/accounts/';
	$label = 'View User';
	}

	return id(new AphrontFormTokenizerControl())
	->setDatasource($source)
	->setLabel($label)
	->setName('view_user')
	->setValue($value)
	->setLimit(1);
	case 'status':
	return id(new AphrontFormToggleButtonsControl())
	->setLabel('Status')
	->setValue($params['status'])
	->setBaseURI($uri, 'status')
	->setButtons(
	array(
	'all' => 'All',
	'open' => 'Open',
	'closed' => pht('Closed'),
	'abandoned' => 'Abandoned',
	));
	case 'order':
	return id(new AphrontFormToggleButtonsControl())
	->setLabel('Order')
	->setValue($params['order'])
	->setBaseURI($uri, 'order')
	->setButtons(
	array(
	'modified' => 'Updated',
	'created' => 'Created',
	));
	default:
	throw new Exception("Unknown control '{$control}'!");
	}
	}

	private function applyControlToQuery($control, $query, array $params) {
	switch ($control) {
	case 'phid':
	case 'subscriber':
	// Already applied by query construction.
	break;
	case 'status':
	if ($params['status'] == 'open') {
	$query->withStatus(DifferentialRevisionQuery::STATUS_OPEN);
	} else if ($params['status'] == 'closed') {
	$query->withStatus(DifferentialRevisionQuery::STATUS_CLOSED);
	} else if ($params['status'] == 'abandoned') {
	$query->withStatus(DifferentialRevisionQuery::STATUS_ABANDONED);
	}
	break;
	case 'order':
	if ($params['order'] == 'created') {
	$query->setOrder(DifferentialRevisionQuery::ORDER_CREATED);
	}
	break;
	default:
	throw new Exception("Unknown control '{$control}'!");
	}
	}

	private function buildViews($filter, $user_phid, array $revisions) {
	assert_instances_of($revisions, 'DifferentialRevision');

	$user = $this->getRequest()->getUser();

	$template = id(new DifferentialRevisionListView())
	->setUser($user)
	->setFields(DifferentialRevisionListView::getDefaultFields());

	$views = array();
	switch ($filter) {
	case 'active':
	list($active, $waiting) = DifferentialRevisionQuery::splitResponsible(
	$revisions,
	$user_phid);

	$view = id(clone $template)
	->setHighlightAge(true)
	->setRevisions($active)
	->loadAssets();
	$views[] = array(
	'title' => 'Action Required',
	'view' => $view,
	);

	// Flags are sort of private, so only show the flag panel if you're
	// looking at your own requests.
	if ($user_phid == $user->getPHID()) {
	$flags = id(new PhabricatorFlagQuery())
	->withOwnerPHIDs(array($user_phid))
	->withTypes(array(PhabricatorPHIDConstants::PHID_TYPE_DREV))
	->needHandles(true)
	->execute();

	if ($flags) {
	$view = id(new PhabricatorFlagListView())
	->setFlags($flags)
	->setUser($user);

	$views[] = array(
	'title' => 'Flagged Revisions',
	'view' => $view,
	'special' => true,
	);
	}
	}

	$view = id(clone $template)
	->setRevisions($waiting)
	->loadAssets();
	$views[] = array(
	'title' => 'Waiting On Others',
	'view' => $view,
	);
	break;
	case 'revisions':
	case 'reviews':
	case 'subscribed':
	case 'drafts':
	case 'all':
	$titles = array(
	'revisions' => 'Revisions by Author',
	'reviews' => 'Revisions by Reviewer',
	'subscribed' => 'Revisions by Subscriber',
	'all' => 'Revisions',
	);
	$view = id(clone $template)
	->setRevisions($revisions)
	->loadAssets();
	$views[] = array(
	'title' => idx($titles, $filter),
	'view' => $view,
	);
	break;
	default:
	throw new Exception("Unknown filter '{$filter}'!");
	}

	return $views;
	}


	}
	diff --git a/src/applications/diffusion/controller/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
	index fa07dd1669..2c16ab2246 100644
	--- a/src/applications/diffusion/controller/DiffusionController.php
	+++ b/src/applications/diffusion/controller/DiffusionController.php
	@@ -1,328 +1,320 @@
	<?php

	abstract class DiffusionController extends PhabricatorController {

	protected $diffusionRequest;

	public function willProcessRequest(array $data) {
	if (isset($data['callsign'])) {
	$drequest = DiffusionRequest::newFromAphrontRequestDictionary(
	$data,
	$this->getRequest());
	$this->diffusionRequest = $drequest;
	}
	}

	public function setDiffusionRequest(DiffusionRequest $request) {
	$this->diffusionRequest = $request;
	return $this;
	}

	protected function getDiffusionRequest() {
	if (!$this->diffusionRequest) {
	throw new Exception("No Diffusion request object!");
	}
	return $this->diffusionRequest;
	}

	public function buildStandardPageResponse($view, array $data) {

	$page = $this->buildStandardPageView();

	$page->setApplicationName('Diffusion');
	$page->setBaseURI('/diffusion/');
	$page->setTitle(idx($data, 'title'));
	$page->setGlyph("\xE2\x89\x88");
	$page->setSearchDefaultScope(PhabricatorSearchScope::SCOPE_COMMITS);

	$page->appendChild($view);

	$response = new AphrontWebpageResponse();
	return $response->setContent($page->render());
	}

	final protected function buildSideNav($selected, $has_change_view) {
	- $nav = new AphrontSideNavView();
	+ $nav = new AphrontSideNavFilterView();
	+ $nav->setBaseURI(new PhutilURI(''));

	$navs = array(
	'history' => 'History View',
	'browse' => 'Browse View',
	'change' => 'Change View',
	);

	if (!$has_change_view) {
	unset($navs['change']);
	}

	$drequest = $this->getDiffusionRequest();
	$branch = $drequest->loadBranch();

	if ($branch && $branch->getLintCommit()) {
	$navs['lint'] = 'Lint View';
	}

	+ $selected_href = null;
	foreach ($navs as $action => $name) {
	$href = $drequest->generateURI(
	array(
	'action' => $action,
	));
	+ if ($action == $selected) {
	+ $selected_href = $href;
	+ }

	- $nav->addNavItem(
	- phutil_render_tag(
	- 'a',
	- array(
	- 'href' => $href,
	- 'class' =>
	- ($action == $selected
	- ? 'aphront-side-nav-selected'
	- : null),
	- ),
	- $name));
	+ $nav->addFilter($href, $name);
	}
	+ $nav->selectFilter($selected_href, null);

	// TODO: URI encoding might need to be sorted out for this link.

	- $nav->addNavItem(
	- phutil_render_tag(
	- 'a',
	- array(
	- 'href' => '/owners/view/search/'.
	- '?repository='.phutil_escape_uri($drequest->getCallsign()).
	- '&path='.phutil_escape_uri('/'.$drequest->getPath()),
	- ),
	- "Search Owners \xE2\x86\x97"));
	+ $nav->addFilter(
	+ '/owners/view/search/'.
	+ '?repository='.phutil_escape_uri($drequest->getCallsign()).
	+ '&path='.phutil_escape_uri('/'.$drequest->getPath()),
	+ "Search Owners \xE2\x86\x97");

	return $nav;
	}

	public function buildCrumbs(array $spec = array()) {
	$crumbs = new AphrontCrumbsView();
	$crumb_list = $this->buildCrumbList($spec);
	$crumbs->setCrumbs($crumb_list);
	return $crumbs;
	}

	protected function buildOpenRevisions() {
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();
	$path = $drequest->getPath();

	$path_map = id(new DiffusionPathIDQuery(array($path)))->loadPathIDs();
	$path_id = idx($path_map, $path);
	if (!$path_id) {
	return null;
	}

	$revisions = id(new DifferentialRevisionQuery())
	->withPath($repository->getID(), $path_id)
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->setOrder(DifferentialRevisionQuery::ORDER_PATH_MODIFIED)
	->setLimit(10)
	->needRelationships(true)
	->execute();

	if (!$revisions) {
	return null;
	}

	$view = id(new DifferentialRevisionListView())
	->setRevisions($revisions)
	->setFields(DifferentialRevisionListView::getDefaultFields())
	->setUser($this->getRequest()->getUser())
	->loadAssets();

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);

	$panel = new AphrontPanelView();
	$panel->setId('pending-differential-revisions');
	$panel->setHeader('Pending Differential Revisions');
	$panel->appendChild($view);

	return $panel;
	}

	private function buildCrumbList(array $spec = array()) {

	$spec = $spec + array(
	'commit' => null,
	'tags' => null,
	'branches' => null,
	'view' => null,
	);

	$crumb_list = array();

	// On the home page, we don't have a DiffusionRequest.
	if ($this->diffusionRequest) {
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();
	} else {
	$drequest = null;
	$repository = null;
	}

	if ($repository) {
	$crumb_list[] = phutil_render_tag(
	'a',
	array(
	'href' => '/diffusion/',
	),
	'Diffusion');
	} else {
	$crumb_list[] = 'Diffusion';
	return $crumb_list;
	}

	$callsign = $repository->getCallsign();
	$repository_name = phutil_escape_html($repository->getName()).' Repository';

	if (!$spec['commit'] && !$spec['tags'] && !$spec['branches']) {
	$branch_name = $drequest->getBranch();
	if ($branch_name) {
	$repository_name .= ' ('.phutil_escape_html($branch_name).')';
	}
	}

	if (!$spec['view'] && !$spec['commit']
	&& !$spec['tags'] && !$spec['branches']) {
	$crumb_list[] = $repository_name;
	return $crumb_list;
	}

	$crumb_list[] = phutil_render_tag(
	'a',
	array(
	'href' => "/diffusion/{$callsign}/",
	),
	$repository_name);

	$raw_commit = $drequest->getRawCommit();

	if ($spec['tags']) {
	if ($spec['commit']) {
	$crumb_list[] = "Tags for ".phutil_render_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'commit',
	'commit' => $raw_commit,
	)),
	),
	phutil_escape_html("r{$callsign}{$raw_commit}"));
	} else {
	$crumb_list[] = 'Tags';
	}
	return $crumb_list;
	}

	if ($spec['branches']) {
	$crumb_list[] = 'Branches';
	return $crumb_list;
	}

	if ($spec['commit']) {
	$crumb_list[] = "r{$callsign}{$raw_commit}";
	return $crumb_list;
	}

	$view = $spec['view'];

	$path = null;
	if (isset($spec['path'])) {
	$path = $drequest->getPath();
	}

	if ($raw_commit) {
	$commit_link = DiffusionView::linkCommit(
	$repository,
	$raw_commit);
	} else {
	$commit_link = '';
	}

	switch ($view) {
	case 'history':
	$view_name = 'History';
	break;
	case 'browse':
	$view_name = 'Browse';
	break;
	case 'lint':
	$view_name = 'Lint';
	break;
	case 'change':
	$view_name = 'Change';
	$crumb_list[] = phutil_escape_html($path).' ('.$commit_link.')';
	return $crumb_list;
	}

	$uri_params = array(
	'action' => $view,
	);

	if (!strlen($path)) {
	$crumb_list[] = $view_name;
	} else {

	$crumb_list[] = phutil_render_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'path' => '',
	) + $uri_params),
	),
	$view_name);

	$path_parts = explode('/', $path);
	do {
	$last = array_pop($path_parts);
	} while ($last == '');

	$path_sections = array();
	$thus_far = '';
	foreach ($path_parts as $path_part) {
	$thus_far .= $path_part.'/';
	$path_sections[] = phutil_render_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'path' => $thus_far,
	) + $uri_params),
	),
	phutil_escape_html($path_part));
	}

	$path_sections[] = phutil_escape_html($last);
	$path_sections = '/'.implode('/', $path_sections);

	$crumb_list[] = $path_sections;
	}

	$last_crumb = array_pop($crumb_list);

	if ($raw_commit) {
	$jump_link = phutil_render_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'commit' => '',
	) + $uri_params),
	),
	'Jump to HEAD');
	$last_crumb .= " @ {$commit_link} ({$jump_link})";
	} else if ($spec['view'] != 'lint') {
	$last_crumb .= " @ HEAD";
	}

	$crumb_list[] = $last_crumb;

	return $crumb_list;
	}

	}
	diff --git a/src/applications/files/view/PhabricatorFileSideNavView.php b/src/applications/files/view/PhabricatorFileSideNavView.php
	index 71cbabc626..62e9a533c4 100644
	--- a/src/applications/files/view/PhabricatorFileSideNavView.php
	+++ b/src/applications/files/view/PhabricatorFileSideNavView.php
	@@ -1,67 +1,48 @@
	<?php

	final class PhabricatorFileSideNavView extends AphrontView {
	private $selectedFilter;

	public function setSelectedFilter($selected_filter) {
	$this->selectedFilter = $selected_filter;
	return $this;
	}
	private function getSelectedFilter() {
	return $this->selectedFilter;
	}

	public function render() {
	$selected_filter = $this->getSelectedFilter();
	if (!$selected_filter) {
	throw new Exception("Call setFilter() before render()!");
	}

	$filters = array(
	'Files' => array(),
	'upload' => array(
	'name' => 'Upload File',
	- 'href' => '/file/filter/upload/'
	),
	'my' => array(
	'name' => 'My Files',
	- 'href' => '/file/filter/my/'
	),
	'all' => array(
	'name' => 'All Files',
	- 'href' => '/file/filter/all/'
	),
	- // TODO: Remove this fairly soon.
	- '<br />' => null,
	- '<div style="font-weight: normal; font-size: smaller; '.
	- 'white-space: normal;">NOTE: Macros have moved to a separate '.
	- 'application. Use the "Search" field to jump to it or choose '.
	- 'More Stuff » Macros from the home page.</span>' => null,
	);

	- $side_nav = new AphrontSideNavView();
	+ $side_nav = new AphrontSideNavFilterView();
	+ $side_nav->setBaseURI(new PhutilURI('/file/filter/'));
	foreach ($filters as $filter_key => $filter) {
	// more of a label than a filter
	if (empty($filter)) {
	- $side_nav->addNavItem(phutil_render_tag(
	- 'span',
	- array(),
	- $filter_key));
	+ $side_nav->addLabel($filter_key);
	continue;
	}
	- $selected = $filter_key == $selected_filter;
	- $side_nav->addNavItem(
	- phutil_render_tag(
	- 'a',
	- array(
	- 'href' => $filter['href'],
	- 'class' => $selected ? 'aphront-side-nav-selected': null,
	- ),
	- $filter['name'])
	- );
	+ $side_nav->addFilter($filter_key, $filter['name']);
	}
	+ $side_nav->selectFilter($selected_filter, null);
	$side_nav->appendChild($this->renderChildren());

	return $side_nav->render();
	}
	}
	diff --git a/src/applications/herald/controller/HeraldTranscriptController.php b/src/applications/herald/controller/HeraldTranscriptController.php
	index 6ed6e2f3fd..f18e77baf6 100644
	--- a/src/applications/herald/controller/HeraldTranscriptController.php
	+++ b/src/applications/herald/controller/HeraldTranscriptController.php
	@@ -1,518 +1,510 @@
	<?php

	final class HeraldTranscriptController extends HeraldController {

	const FILTER_AFFECTED = 'affected';
	const FILTER_OWNED = 'owned';
	const FILTER_ALL = 'all';

	private $id;
	private $filter;
	private $handles;

	public function willProcessRequest(array $data) {
	$this->id = $data['id'];
	$map = $this->getFilterMap();
	$this->filter = idx($data, 'filter');
	if (empty($map[$this->filter])) {
	$this->filter = self::FILTER_AFFECTED;
	}
	}

	public function processRequest() {

	$xscript = id(new HeraldTranscript())->load($this->id);
	if (!$xscript) {
	throw new Exception('Uknown transcript!');
	}

	require_celerity_resource('herald-test-css');

	$nav = $this->buildSideNav();

	$object_xscript = $xscript->getObjectTranscript();
	if (!$object_xscript) {
	$notice = id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
	->setTitle('Old Transcript')
	->appendChild(
	'<p>Details of this transcript have been garbage collected.</p>');
	$nav->appendChild($notice);
	} else {
	$filter = $this->getFilterPHIDs();
	$this->filterTranscript($xscript, $filter);
	$phids = array_merge($filter, $this->getTranscriptPHIDs($xscript));
	$phids = array_unique($phids);
	$phids = array_filter($phids);

	$handles = $this->loadViewerHandles($phids);
	$this->handles = $handles;

	if ($xscript->getDryRun()) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle('Dry Run');
	$notice->appendChild(
	'This was a dry run to test Herald rules, no actions were executed.');
	$nav->appendChild($notice);
	}

	$apply_xscript_panel = $this->buildApplyTranscriptPanel(
	$xscript);
	$nav->appendChild($apply_xscript_panel);

	$action_xscript_panel = $this->buildActionTranscriptPanel(
	$xscript);
	$nav->appendChild($action_xscript_panel);

	$object_xscript_panel = $this->buildObjectTranscriptPanel(
	$xscript);
	$nav->appendChild($object_xscript_panel);
	}

	$main_nav = $this->renderNav();
	$main_nav->selectFilter('transcript');
	$main_nav->appendChild($nav);

	return $this->buildStandardPageResponse(
	$main_nav,
	array(
	'title' => 'Transcript',
	));
	}

	protected function renderConditionTestValue($condition, $handles) {
	$value = $condition->getTestValue();
	if (!is_scalar($value) && $value !== null) {
	foreach ($value as $key => $phid) {
	$handle = idx($handles, $phid);
	if ($handle) {
	$value[$key] = $handle->getName();
	} else {
	// This shouldn't ever really happen as we are supposed to have
	// grabbed handles for everything, but be super liberal in what
	// we accept here since we expect all sorts of weird issues as we
	// version the system.
	$value[$key] = 'Unknown Object #'.$phid;
	}
	}
	sort($value);
	$value = implode(', ', $value);
	}

	return
	'<span class="condition-test-value">'.
	phutil_escape_html($value).
	'</span>';
	}

	private function buildSideNav() {
	- $nav = new AphrontSideNavView();
	+ $nav = new AphrontSideNavFilterView();
	+ $nav->setBaseURI(new PhutilURI('/herald/transcript/'.$this->id.'/'));

	$items = array();
	$filters = $this->getFilterMap();
	foreach ($filters as $key => $name) {
	- $nav->addNavItem(
	- phutil_render_tag(
	- 'a',
	- array(
	- 'href' => '/herald/transcript/'.$this->id.'/'.$key.'/',
	- 'class' =>
	- ($key == $this->filter)
	- ? 'aphront-side-nav-selected'
	- : null,
	- ),
	- phutil_escape_html($name)));
	+ $nav->addFilter($key, $name);
	}
	+ $nav->selectFilter($this->filter, null);

	return $nav;
	}

	protected function getFilterMap() {
	return array(
	self::FILTER_AFFECTED => 'Rules that Affected Me',
	self::FILTER_OWNED => 'Rules I Own',
	self::FILTER_ALL => 'All Rules',
	);
	}


	protected function getFilterPHIDs() {
	return array($this->getRequest()->getUser()->getPHID());

	/* TODO
	$viewer_id = $this->getRequest()->getUser()->getPHID();

	$fbids = array();
	if ($this->filter == self::FILTER_AFFECTED) {
	$fbids[] = $viewer_id;
	require_module_lazy('intern/subscriptions');
	$datastore = new SubscriberDatabaseStore();
	$lists = $datastore->getUserMailmanLists($viewer_id);
	foreach ($lists as $list) {
	$fbids[] = $list;
	}
	}
	return $fbids;
	*/
	}

	protected function getTranscriptPHIDs($xscript) {
	$phids = array();

	$object_xscript = $xscript->getObjectTranscript();
	if (!$object_xscript) {
	return array();
	}

	$phids[] = $object_xscript->getPHID();

	foreach ($xscript->getApplyTranscripts() as $apply_xscript) {
	// TODO: This is total hacks. Add another amazing layer of abstraction.
	$target = (array)$apply_xscript->getTarget();
	foreach ($target as $phid) {
	if ($phid) {
	$phids[] = $phid;
	}
	}
	}

	foreach ($xscript->getRuleTranscripts() as $rule_xscript) {
	$phids[] = $rule_xscript->getRuleOwner();
	}

	$condition_xscripts = $xscript->getConditionTranscripts();
	if ($condition_xscripts) {
	$condition_xscripts = call_user_func_array(
	'array_merge',
	$condition_xscripts);
	}
	foreach ($condition_xscripts as $condition_xscript) {
	$value = $condition_xscript->getTestValue();
	// TODO: Also total hacks.
	if (is_array($value)) {
	foreach ($value as $phid) {
	if ($phid) { // TODO: Probably need to make sure this "looks like" a
	// PHID or decrease the level of hacks here; this used
	// to be an is_numeric() check in Facebook land.
	$phids[] = $phid;
	}
	}
	}
	}

	return $phids;
	}

	protected function filterTranscript($xscript, $filter_phids) {
	$filter_owned = ($this->filter == self::FILTER_OWNED);
	$filter_affected = ($this->filter == self::FILTER_AFFECTED);

	if (!$filter_owned && !$filter_affected) {
	// No filtering to be done.
	return;
	}

	if (!$xscript->getObjectTranscript()) {
	return;
	}

	$user_phid = $this->getRequest()->getUser()->getPHID();

	$keep_apply_xscripts = array();
	$keep_rule_xscripts = array();

	$filter_phids = array_fill_keys($filter_phids, true);

	$rule_xscripts = $xscript->getRuleTranscripts();
	foreach ($xscript->getApplyTranscripts() as $id => $apply_xscript) {
	$rule_id = $apply_xscript->getRuleID();
	if ($filter_owned) {
	if (empty($rule_xscripts[$rule_id])) {
	// No associated rule so you can't own this effect.
	continue;
	}
	if ($rule_xscripts[$rule_id]->getRuleOwner() != $user_phid) {
	continue;
	}
	} else if ($filter_affected) {
	$targets = (array)$apply_xscript->getTarget();
	if (!array_select_keys($filter_phids, $targets)) {
	continue;
	}
	}
	$keep_apply_xscripts[$id] = true;
	if ($rule_id) {
	$keep_rule_xscripts[$rule_id] = true;
	}
	}

	foreach ($rule_xscripts as $rule_id => $rule_xscript) {
	if ($filter_owned && $rule_xscript->getRuleOwner() == $user_phid) {
	$keep_rule_xscripts[$rule_id] = true;
	}
	}

	$xscript->setRuleTranscripts(
	array_intersect_key(
	$xscript->getRuleTranscripts(),
	$keep_rule_xscripts));

	$xscript->setApplyTranscripts(
	array_intersect_key(
	$xscript->getApplyTranscripts(),
	$keep_apply_xscripts));

	$xscript->setConditionTranscripts(
	array_intersect_key(
	$xscript->getConditionTranscripts(),
	$keep_rule_xscripts));
	}

	private function buildApplyTranscriptPanel($xscript) {
	$handles = $this->handles;

	$action_names = HeraldActionConfig::getActionMessageMapForRuleType(null);

	$rows = array();
	foreach ($xscript->getApplyTranscripts() as $apply_xscript) {

	$target = $apply_xscript->getTarget();
	switch ($apply_xscript->getAction()) {
	case HeraldActionConfig::ACTION_NOTHING:
	$target = '';
	break;
	case HeraldActionConfig::ACTION_FLAG:
	$target = PhabricatorFlagColor::getColorName($target);
	break;
	default:
	if ($target) {
	foreach ($target as $k => $phid) {
	$target[$k] = $handles[$phid]->getName();
	}
	$target = implode("\n", $target);
	} else {
	$target = '<empty>';
	}
	break;
	}
	$target = phutil_escape_html($target);

	if ($apply_xscript->getApplied()) {
	$outcome = '<span class="outcome-success">SUCCESS</span>';
	} else {
	$outcome = '<span class="outcome-failure">FAILURE</span>';
	}
	$outcome .= ' '.phutil_escape_html($apply_xscript->getAppliedReason());

	$rows[] = array(
	phutil_escape_html($action_names[$apply_xscript->getAction()]),
	$target,
	'<strong>Taken because:</strong> '.
	phutil_escape_html($apply_xscript->getReason()).
	'<br />'.
	'<strong>Outcome:</strong> '.$outcome,
	);
	}

	$table = new AphrontTableView($rows);
	$table->setNoDataString('No actions were taken.');
	$table->setHeaders(
	array(
	'Action',
	'Target',
	'Details',
	));
	$table->setColumnClasses(
	array(
	'',
	'',
	'wide',
	));

	$panel = new AphrontPanelView();
	$panel->setHeader('Actions Taken');
	$panel->appendChild($table);

	return $panel;
	}

	private function buildActionTranscriptPanel($xscript) {
	$action_xscript = mgroup($xscript->getApplyTranscripts(), 'getRuleID');

	$field_names = HeraldFieldConfig::getFieldMap();
	$condition_names = HeraldConditionConfig::getConditionMap();

	$handles = $this->handles;

	$rule_markup = array();
	foreach ($xscript->getRuleTranscripts() as $rule_id => $rule) {
	$cond_markup = array();
	foreach ($xscript->getConditionTranscriptsForRule($rule_id) as $cond) {
	if ($cond->getNote()) {
	$note =
	'<div class="herald-condition-note">'.
	phutil_escape_html($cond->getNote()).
	'</div>';
	} else {
	$note = null;
	}

	if ($cond->getResult()) {
	$result =
	'<span class="herald-outcome condition-pass">'.
	"\xE2\x9C\x93".
	'</span>';
	} else {
	$result =
	'<span class="herald-outcome condition-fail">'.
	"\xE2\x9C\x98".
	'</span>';
	}

	$cond_markup[] =
	'<li>'.
	$result.' Condition: '.
	phutil_escape_html($field_names[$cond->getFieldName()]).
	' '.
	phutil_escape_html($condition_names[$cond->getCondition()]).
	' '.
	$this->renderConditionTestValue($cond, $handles).
	$note.
	'</li>';
	}

	if ($rule->getResult()) {
	$result = '<span class="herald-outcome rule-pass">PASS</span>';
	$class = 'herald-rule-pass';
	} else {
	$result = '<span class="herald-outcome rule-fail">FAIL</span>';
	$class = 'herald-rule-fail';
	}

	$cond_markup[] =
	'<li>'.$result.' '.phutil_escape_html($rule->getReason()).'</li>';

	/*
	if ($rule->getResult()) {
	$actions = idx($action_xscript, $rule_id, array());
	if ($actions) {
	$cond_markup[] = <li><div class="action-header">Actions</div></li>;
	foreach ($actions as $action) {

	$target = $action->getTarget();
	if ($target) {
	foreach ((array)$target as $k => $phid) {
	$target[$k] = $handles[$phid]->getName();
	}
	$target = <strong>: {implode(', ', $target)}</strong>;
	}

	$cond_markup[] =
	<li>
	{$action_names[$action->getAction()]}
	{$target}
	</li>;
	}
	}
	}
	*/
	$user_phid = $this->getRequest()->getUser()->getPHID();

	$name = $rule->getRuleName();
	if ($rule->getRuleOwner() == $user_phid) {
	// $name = <a href={"/herald/rule/".$rule->getRuleID()."/"}>{$name}</a>;
	}

	$rule_markup[] =
	phutil_render_tag(
	'li',
	array(
	'class' => $class,
	),
	'<div class="rule-name">'.
	'<strong>'.phutil_escape_html($name).'</strong> '.
	phutil_escape_html($handles[$rule->getRuleOwner()]->getName()).
	'</div>'.
	'<ul>'.implode("\n", $cond_markup).'</ul>');
	}

	$panel = new AphrontPanelView();
	$panel->setHeader('Rule Details');
	$panel->appendChild(
	'<ul class="herald-explain-list">'.
	implode("\n", $rule_markup).
	'</ul>');

	return $panel;
	}

	private function buildObjectTranscriptPanel($xscript) {

	$field_names = HeraldFieldConfig::getFieldMap();

	$object_xscript = $xscript->getObjectTranscript();

	$data = array();
	if ($object_xscript) {
	$phid = $object_xscript->getPHID();
	$handles = $this->loadViewerHandles(array($phid));

	$data += array(
	'Object Name' => $object_xscript->getName(),
	'Object Type' => $object_xscript->getType(),
	'Object PHID' => $phid,
	'Object Link' => $handles[$phid]->renderLink(),
	);
	}

	$data += $xscript->getMetadataMap();

	if ($object_xscript) {
	foreach ($object_xscript->getFields() as $field => $value) {
	$field = idx($field_names, $field, '['.$field.'?]');
	$data['Field: '.$field] = $value;
	}
	}

	$rows = array();
	foreach ($data as $name => $value) {
	if (!is_scalar($value) && !is_null($value)) {
	$value = implode("\n", $value);
	}

	if (strlen($value) > 256) {
	$value = phutil_render_tag(
	'textarea',
	array(
	'class' => 'herald-field-value-transcript',
	),
	phutil_escape_html($value));
	} else if ($name === 'Object Link') {
	// The link cannot be escaped
	} else {
	$value = phutil_escape_html($value);
	}

	$rows[] = array(
	phutil_escape_html($name),
	$value,
	);
	}

	$table = new AphrontTableView($rows);
	$table->setColumnClasses(
	array(
	'header',
	'wide',
	));

	$panel = new AphrontPanelView();
	$panel->setHeader('Object Transcript');
	$panel->appendChild($table);

	return $panel;
	}


	}
	diff --git a/src/applications/phriction/controller/PhrictionListController.php b/src/applications/phriction/controller/PhrictionListController.php
	index 45cca58155..2ee98ddedd 100644
	--- a/src/applications/phriction/controller/PhrictionListController.php
	+++ b/src/applications/phriction/controller/PhrictionListController.php
	@@ -1,170 +1,163 @@
	<?php

	/**
	* @group phriction
	*/
	final class PhrictionListController
	extends PhrictionController {

	private $view;

	public function willProcessRequest(array $data) {
	$this->view = idx($data, 'view');
	}

	public function processRequest() {

	$request = $this->getRequest();
	$user = $request->getUser();

	$views = array(
	'active' => 'Active Documents',
	'all' => 'All Documents',
	'updates' => 'Recently Updated',
	);

	if (empty($views[$this->view])) {
	$this->view = 'active';
	}

	- $nav = new AphrontSideNavView();
	+ $nav = new AphrontSideNavFilterView();
	+ $nav->setBaseURI(new PhutilURI('/phriction/list/'));
	foreach ($views as $view => $name) {
	- $nav->addNavItem(
	- phutil_render_tag(
	- 'a',
	- array(
	- 'href' => '/phriction/list/'.$view.'/',
	- 'class' => ($this->view == $view)
	- ? 'aphront-side-nav-selected'
	- : null,
	- ),
	- phutil_escape_html($name)));
	+ $nav->addFilter($view, $name);
	}
	+ $nav->selectFilter($this->view, null);

	$pager = new AphrontPagerView();
	$pager->setURI($request->getRequestURI(), 'page');
	$pager->setOffset($request->getInt('page'));

	$documents = $this->loadDocuments($pager);

	$content = mpull($documents, 'getContent');
	$phids = mpull($content, 'getAuthorPHID');

	$handles = $this->loadViewerHandles($phids);


	$rows = array();
	foreach ($documents as $document) {
	$content = $document->getContent();
	$rows[] = array(
	$handles[$content->getAuthorPHID()]->renderLink(),
	phutil_render_tag(
	'a',
	array(
	'href' => PhrictionDocument::getSlugURI($document->getSlug()),
	),
	phutil_escape_html($content->getTitle())),
	phabricator_date($content->getDateCreated(), $user),
	phabricator_time($content->getDateCreated(), $user),
	);
	}

	$document_table = new AphrontTableView($rows);
	$document_table->setHeaders(
	array(
	'Last Editor',
	'Title',
	'Last Update',
	'Time',
	));

	$document_table->setColumnClasses(
	array(
	'',
	'wide pri',
	'right',
	'right',
	));

	$view_headers = array(
	'active' => 'Active Documents',
	'all' => 'All Documents',
	'updates' => 'Recently Updated Documents',
	);
	$view_header = $view_headers[$this->view];

	$panel = new AphrontPanelView();
	$panel->setHeader($view_header);
	$panel->appendChild($document_table);
	$panel->appendChild($pager);

	$nav->appendChild($panel);

	return $this->buildStandardPageResponse($nav,
	array(
	'title' => 'Phriction Main'
	));
	}

	private function loadDocuments(AphrontPagerView $pager) {

	// TODO: Do we want/need a query object for this?

	$document_dao = new PhrictionDocument();
	$content_dao = new PhrictionContent();
	$conn = $document_dao->establishConnection('r');

	switch ($this->view) {
	case 'active':
	$data = queryfx_all(
	$conn,
	'SELECT * FROM %T WHERE status != %d ORDER BY id DESC LIMIT %d, %d',
	$document_dao->getTableName(),
	PhrictionDocumentStatus::STATUS_DELETED,
	$pager->getOffset(),
	$pager->getPageSize() + 1);
	break;
	case 'all':
	$data = queryfx_all(
	$conn,
	'SELECT * FROM %T ORDER BY id DESC LIMIT %d, %d',
	$document_dao->getTableName(),
	$pager->getOffset(),
	$pager->getPageSize() + 1);
	break;
	case 'updates':

	// TODO: This query is a little suspicious, verify we don't need to key
	// or change it once we get more data.

	$data = queryfx_all(
	$conn,
	'SELECT d.* FROM %T d JOIN %T c ON c.documentID = d.id
	GROUP BY c.documentID
	ORDER BY MAX(c.id) DESC LIMIT %d, %d',
	$document_dao->getTableName(),
	$content_dao->getTableName(),
	$pager->getOffset(),
	$pager->getPageSize() + 1);
	break;
	default:
	throw new Exception("Unknown view '{$this->view}'!");
	}

	$data = $pager->sliceResults($data);

	$documents = $document_dao->loadAllFromArray($data);
	if ($documents) {
	$content = $content_dao->loadAllWhere(
	'documentID IN (%Ld)',
	mpull($documents, 'getID'));
	$content = mpull($content, null, 'getDocumentID');
	foreach ($documents as $document) {
	$document->attachContent($content[$document->getID()]);
	}
	}

	return $documents;
	}

	}
	diff --git a/src/applications/repository/controller/PhabricatorRepositoryEditController.php b/src/applications/repository/controller/PhabricatorRepositoryEditController.php
	index 077bd9ab25..16ffd4accc 100644
	--- a/src/applications/repository/controller/PhabricatorRepositoryEditController.php
	+++ b/src/applications/repository/controller/PhabricatorRepositoryEditController.php
	@@ -1,680 +1,674 @@
	<?php

	final class PhabricatorRepositoryEditController
	extends PhabricatorRepositoryController {

	private $id;
	private $view;
	private $repository;
	private $sideNav;

	public function willProcessRequest(array $data) {
	$this->id = $data['id'];
	$this->view = idx($data, 'view');
	}

	public function processRequest() {

	$request = $this->getRequest();

	$repository = id(new PhabricatorRepository())->load($this->id);
	if (!$repository) {
	return new Aphront404Response();
	}

	$views = array(
	'basic' => 'Basics',
	'tracking' => 'Tracking',
	);

	$this->repository = $repository;

	if (!isset($views[$this->view])) {
	$this->view = head_key($views);
	}

	- $nav = new AphrontSideNavView();
	+ $nav = new AphrontSideNavFilterView();
	+ $base_uri = new PhutilURI('/repository/edit/'.$repository->getID().'/');
	+ $nav->setBaseURI($base_uri);
	foreach ($views as $view => $name) {
	- $nav->addNavItem(
	- phutil_render_tag(
	- 'a',
	- array(
	- 'class' => ($view == $this->view
	- ? 'aphront-side-nav-selected'
	- : null),
	- 'href' => '/repository/edit/'.$repository->getID().'/'.$view.'/',
	- ),
	- phutil_escape_html($name)));
	+ $nav->addFilter($view, $name);
	}
	+ $nav->selectFilter($this->view, null);

	$nav->appendChild($this->renderDaemonNotice());

	$this->sideNav = $nav;

	switch ($this->view) {
	case 'basic':
	return $this->processBasicRequest();
	case 'tracking':
	return $this->processTrackingRequest();
	default:
	throw new Exception("Unknown view.");
	}
	}

	protected function processBasicRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();
	$repository = $this->repository;
	$repository_id = $repository->getID();

	$errors = array();

	$e_name = true;

	if ($request->isFormPost()) {
	$repository->setName($request->getStr('name'));

	if (!strlen($repository->getName())) {
	$e_name = 'Required';
	$errors[] = 'Repository name is required.';
	} else {
	$e_name = null;
	}

	$repository->setDetail('description', $request->getStr('description'));
	$repository->setDetail('encoding', $request->getStr('encoding'));

	if (!$errors) {
	$repository->save();
	return id(new AphrontRedirectResponse())
	->setURI('/repository/edit/'.$repository_id.'/basic/?saved=true');
	}
	}

	$error_view = null;
	if ($errors) {
	$error_view = new AphrontErrorView();
	$error_view->setErrors($errors);
	$error_view->setTitle('Form Errors');
	} else if ($request->getStr('saved')) {
	$error_view = new AphrontErrorView();
	$error_view->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$error_view->setTitle('Changes Saved');
	$error_view->appendChild(
	'Repository changes were saved.');
	}

	$encoding_doc_link = PhabricatorEnv::getDoclink(
	'article/User_Guide_UTF-8_and_Character_Encoding.html');

	$form = new AphrontFormView();
	$form
	->setUser($user)
	->setAction('/repository/edit/'.$repository->getID().'/')
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Name')
	->setName('name')
	->setValue($repository->getName())
	->setError($e_name)
	->setCaption('Human-readable repository name.'))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Description')
	->setName('description')
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
	->setValue($repository->getDetail('description')))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Callsign')
	->setName('callsign')
	->setValue($repository->getCallsign()))
	->appendChild('
	<p class="aphront-form-instructions">'.
	'If source code in this repository uses a character '.
	'encoding other than UTF-8 (for example, ISO-8859-1), '.
	'specify it here. You can usually leave this field blank. '.
	'See User Guide: '.
	'<a href="'.$encoding_doc_link.'">'.
	'UTF-8 and Character Encoding'.
	'</a> for more information.'.
	'</p>')
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel('Encoding')
	->setName('encoding')
	->setValue($repository->getDetail('encoding')))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Type')
	->setName('type')
	->setValue($repository->getVersionControlSystem()))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('ID')
	->setValue($repository->getID()))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('PHID')
	->setValue($repository->getPHID()))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save'));

	$panel = new AphrontPanelView();
	$panel->setHeader('Edit Repository');
	$panel->appendChild($form);
	$panel->setWidth(AphrontPanelView::WIDTH_FORM);


	$nav = $this->sideNav;

	$nav->appendChild($error_view);
	$nav->appendChild($panel);

	return $this->buildStandardPageResponse(
	$nav,
	array(
	'title' => 'Edit Repository',
	));
	}

	private function processTrackingRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();
	$repository = $this->repository;
	$repository_id = $repository->getID();

	$errors = array();

	$e_uri = null;
	$e_path = null;

	$is_git = false;
	$is_svn = false;
	$is_mercurial = false;

	$e_ssh_key = null;
	$e_ssh_keyfile = null;
	$e_branch = null;

	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$is_git = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$is_svn = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$is_mercurial = true;
	break;
	default:
	throw new Exception("Unsupported VCS!");
	}

	$has_branches = ($is_git \|\| $is_mercurial);
	$has_local = ($is_git \|\| $is_mercurial);
	$has_branch_filter = ($is_git);
	$has_auth_support = $is_svn;

	if ($request->isFormPost()) {
	$tracking = ($request->getStr('tracking') == 'enabled' ? true : false);
	$repository->setDetail('tracking-enabled', $tracking);
	$repository->setDetail('remote-uri', $request->getStr('uri'));
	if ($has_local) {
	$repository->setDetail('local-path', $request->getStr('path'));
	}

	if ($has_branch_filter) {
	$branch_filter = $request->getStrList('branch-filter');
	$branch_filter = array_fill_keys($branch_filter, true);

	$repository->setDetail('branch-filter', $branch_filter);

	$close_commits_filter = $request->getStrList('close-commits-filter');
	$close_commits_filter = array_fill_keys($close_commits_filter, true);

	$repository->setDetail('close-commits-filter', $close_commits_filter);
	}

	$repository->setDetail(
	'disable-autoclose',
	$request->getStr('autoclose') == 'disabled' ? true : false);

	$repository->setDetail(
	'pull-frequency',
	max(1, $request->getInt('frequency')));

	if ($has_branches) {
	$repository->setDetail(
	'default-branch',
	$request->getStr('default-branch'));
	if ($is_git) {
	$branch_name = $repository->getDetail('default-branch');
	if (strpos($branch_name, '/') !== false) {
	$e_branch = 'Invalid';
	$errors[] = "Your branch name should not specify an explicit ".
	"remote. For instance, use 'master', not ".
	"'origin/master'.";
	}
	}
	}

	$repository->setDetail(
	'default-owners-path',
	$request->getStr(
	'default-owners-path',
	'/'));

	$repository->setDetail('ssh-login', $request->getStr('ssh-login'));
	$repository->setDetail('ssh-key', $request->getStr('ssh-key'));
	$repository->setDetail('ssh-keyfile', $request->getStr('ssh-keyfile'));

	$repository->setDetail('http-login', $request->getStr('http-login'));
	$repository->setDetail('http-pass', $request->getStr('http-pass'));

	if ($repository->getDetail('ssh-key') &&
	$repository->getDetail('ssh-keyfile')) {
	$errors[] =
	"Specify only one of 'SSH Private Key' and 'SSH Private Key File', ".
	"not both.";
	$e_ssh_key = 'Choose Only One';
	$e_ssh_keyfile = 'Choose Only One';
	}

	$repository->setDetail(
	'herald-disabled',
	$request->getInt('herald-disabled', 0));

	if ($is_svn) {
	$repository->setUUID($request->getStr('uuid'));
	$subpath = ltrim($request->getStr('svn-subpath'), '/');
	if ($subpath) {
	$subpath = rtrim($subpath, '/').'/';
	}
	$repository->setDetail('svn-subpath', $subpath);
	}

	if ($tracking) {
	if (!$repository->getDetail('remote-uri')) {
	$e_uri = 'Required';
	$errors[] = "Repository URI is required.";
	} else if ($is_svn &&
	!preg_match('@/$@', $repository->getDetail('remote-uri'))) {

	$e_uri = 'Invalid';
	$errors[] = 'Subversion Repository Root must end in a slash ("/").';
	} else {
	$e_uri = null;
	}

	if ($has_local) {
	if (!$repository->getDetail('local-path')) {
	$e_path = 'Required';
	$errors[] = "Local path is required.";
	} else {
	$e_path = null;
	}
	}
	}

	if (!$errors) {
	$repository->save();
	return id(new AphrontRedirectResponse())
	->setURI('/repository/edit/'.$repository_id.'/tracking/?saved=true');
	}
	}

	$error_view = null;
	if ($errors) {
	$error_view = new AphrontErrorView();
	$error_view->setErrors($errors);
	$error_view->setTitle('Form Errors');
	} else if ($request->getStr('saved')) {
	$error_view = new AphrontErrorView();
	$error_view->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$error_view->setTitle('Changes Saved');
	$error_view->appendChild('Tracking changes were saved.');
	} else if (!$repository->isTracked()) {
	$error_view = new AphrontErrorView();
	$error_view->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$error_view->setTitle('Repository Not Tracked');
	$error_view->appendChild(
	'Tracking is currently "Disabled" for this repository, so it will '.
	'not be imported into Phabricator. You can enable it below.');
	}

	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	$is_git = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$is_svn = true;
	break;
	}

	$doc_href = PhabricatorEnv::getDoclink('article/Diffusion_User_Guide.html');
	$user_guide_link = phutil_render_tag(
	'a',
	array(
	'href' => $doc_href,
	),
	'Diffusion User Guide');

	$form = new AphrontFormView();
	$form
	->setUser($user)
	->setAction('/repository/edit/'.$repository->getID().'/tracking/')
	->appendChild(
	'<p class="aphront-form-instructions">Phabricator can track '.
	'repositories, importing commits as they happen and notifying '.
	'Differential, Diffusion, Herald, and other services. To enable '.
	'tracking for a repository, configure it here and then start (or '.
	'restart) the daemons. More information is available in the '.
	'<strong>'.$user_guide_link.'</strong>.</p>');

	$form
	->appendChild(
	id(new AphrontFormInsetView())
	->setTitle('Basics')
	->appendChild(id(new AphrontFormStaticControl())
	->setLabel('Repository Name')
	->setValue($repository->getName()))
	->appendChild(id(new AphrontFormSelectControl())
	->setName('tracking')
	->setLabel('Tracking')
	->setOptions(array(
	'disabled' => 'Disabled',
	'enabled' => 'Enabled',
	))
	->setValue(
	$repository->isTracked()
	? 'enabled'
	: 'disabled')));

	$inset = new AphrontFormInsetView();
	$inset->setTitle('Remote URI');

	$clone_command = null;
	$fetch_command = null;
	if ($is_git) {
	$clone_command = 'git clone';
	$fetch_command = 'git fetch';
	} else if ($is_mercurial) {
	$clone_command = 'hg clone';
	$fetch_command = 'hg pull';
	}

	$uri_label = 'Repository URI';
	if ($has_local) {
	if ($is_git) {
	$instructions =
	'Enter the URI to clone this repository from. It should look like '.
	'<tt>git@github.com:example/example.git</tt>, '.
	'<tt>ssh://user@host.com/git/example.git</tt>, or '.
	'<tt>file:///local/path/to/repo</tt>';
	} else if ($is_mercurial) {
	$instructions =
	'Enter the URI to clone this repository from. It should look '.
	'something like <tt>ssh://user@host.com/hg/example</tt>';
	}
	$inset->appendChild(
	'<p class="aphront-form-instructions">'.$instructions.'</p>');
	} else if ($is_svn) {
	$instructions =
	'Enter the <strong>Repository Root</strong> for this SVN repository. '.
	'You can figure this out by running <tt>svn info</tt> and looking at '.
	'the value in the <tt>Repository Root</tt> field. It should be a URI '.
	'and look like <tt>http://svn.example.org/svn/</tt>, '.
	'<tt>svn+ssh://svn.example.com/svnroot/</tt>, or '.
	'<tt>svn://svn.example.net/svn/</tt>';
	$inset->appendChild(
	'<p class="aphront-form-instructions">'.$instructions.'</p>');
	$uri_label = 'Repository Root';
	}

	$inset
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('uri')
	->setLabel($uri_label)
	->setID('remote-uri')
	->setValue($repository->getDetail('remote-uri'))
	->setError($e_uri));

	$inset->appendChild(
	'<div class="aphront-form-instructions">'.
	'If you want to connect to this repository over SSH, enter the '.
	'username and private key to use. You can leave these fields blank if '.
	'the repository does not use SSH.'.
	'</div>');

	$inset
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('ssh-login')
	->setLabel('SSH User')
	->setValue($repository->getDetail('ssh-login')))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setName('ssh-key')
	->setLabel('SSH Private Key')
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
	->setValue($repository->getDetail('ssh-key'))
	->setError($e_ssh_key)
	->setCaption('Specify the entire private key, <em>or</em>...'))
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('ssh-keyfile')
	->setLabel('SSH Private Key File')
	->setValue($repository->getDetail('ssh-keyfile'))
	->setError($e_ssh_keyfile)
	->setCaption(
	'...specify a path on disk where the daemon should '.
	'look for a private key.'));

	if ($has_auth_support) {
	$inset
	->appendChild(
	'<div class="aphront-form-instructions">'.
	'If you want to connect to this repository with a username and '.
	'password, such as over HTTP Basic Auth or SVN with SASL, '.
	'enter the username and password to use. You can leave these '.
	'fields blank if the repository does not use a username and '.
	'password for authentication.'.
	'</div>')
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('http-login')
	->setLabel('Username')
	->setValue($repository->getDetail('http-login')))
	->appendChild(
	id(new AphrontFormPasswordControl())
	->setName('http-pass')
	->setLabel('Password')
	->setValue($repository->getDetail('http-pass')));
	}

	$inset
	->appendChild(
	'<div class="aphront-form-important">'.
	'To test your authentication configuration, <strong>save this '.
	'form</strong> and then run this script:'.
	'<code>'.
	'phabricator/ $ ./scripts/repository/test_connection.php '.
	phutil_escape_html($repository->getCallsign()).
	'</code>'.
	'This will verify that your configuration is correct and the '.
	'daemons can connect to the remote repository and pull changes '.
	'from it.'.
	'</div>');

	$form->appendChild($inset);

	$inset = new AphrontFormInsetView();
	$inset->setTitle('Repository Information');

	if ($has_local) {
	$inset->appendChild(
	'<p class="aphront-form-instructions">Select a path on local disk '.
	'which the daemons should <tt>'.$clone_command.'</tt> the repository '.
	'into. This must be readable and writable by the daemons, and '.
	'readable by the webserver. The daemons will <tt>'.$fetch_command.
	'</tt> and keep this repository up to date.</p>');
	$inset->appendChild(
	id(new AphrontFormTextControl())
	->setName('path')
	->setLabel('Local Path')
	->setValue($repository->getDetail('local-path'))
	->setError($e_path));
	} else if ($is_svn) {
	$inset->appendChild(
	'<p class="aphront-form-instructions">If you only want to parse one '.
	'subpath of the repository, specify it here, relative to the '.
	'repository root (e.g., <tt>trunk/</tt> or <tt>projects/wheel/</tt>). '.
	'If you want to parse multiple subdirectories, create a separate '.
	'Phabricator repository for each one.</p>');
	$inset->appendChild(
	id(new AphrontFormTextControl())
	->setName('svn-subpath')
	->setLabel('Subpath')
	->setValue($repository->getDetail('svn-subpath'))
	->setError($e_path));
	}

	if ($has_branch_filter) {
	$branch_filter_str = implode(
	', ',
	array_keys($repository->getDetail('branch-filter', array())));
	$inset
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('branch-filter')
	->setLabel('Track Only')
	->setValue($branch_filter_str)
	->setCaption(
	'Optional list of branches to track. Other branches will be '.
	'completely ignored. If left empty, all branches are tracked. '.
	'Example: <tt>master, release</tt>'));
	}

	$inset
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('frequency')
	->setLabel('Pull Frequency')
	->setValue($repository->getDetail('pull-frequency', 15))
	->setCaption(
	'Number of seconds daemon should sleep between requests. Larger '.
	'numbers reduce load but also decrease responsiveness.'));

	$form->appendChild($inset);

	$inset = new AphrontFormInsetView();
	$inset->setTitle('Application Configuration');

	if ($has_branches) {
	$inset
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('default-branch')
	->setLabel('Default Branch')
	->setValue($repository->getDefaultBranch())
	->setError($e_branch)
	->setCaption(
	'Default branch to show in Diffusion.'));
	}

	$inset
	->appendChild(id(new AphrontFormSelectControl())
	->setName('autoclose')
	->setLabel('Autoclose')
	->setOptions(array(
	'enabled' => 'Enabled: Automatically Close Pushed Revisions',
	'disabled' => 'Disabled: Ignore Pushed Revisions',
	))
	->setCaption(
	"Automatically close Differential revisions when associated commits ".
	"are pushed to this repository.")
	->setValue(
	$repository->getDetail('disable-autoclose', false)
	? 'disabled'
	: 'enabled'));

	if ($has_branch_filter) {
	$close_commits_filter_str = implode(
	', ',
	array_keys($repository->getDetail('close-commits-filter', array())));
	$inset
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('close-commits-filter')
	->setLabel('Autoclose Branches')
	->setValue($close_commits_filter_str)
	->setCaption(
	'Optional list of branches which can trigger autoclose. '.
	'If left empty, all branches trigger autoclose.'));
	}

	$inset
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('default-owners-path')
	->setLabel('Default Owners Path')
	->setValue(
	$repository->getDetail(
	'default-owners-path',
	'/'))
	->setCaption('Default path in Owners tool.'));

	$inset
	->appendChild(
	id(new AphrontFormSelectControl())
	->setName('herald-disabled')
	->setLabel('Herald/Feed Enabled')
	->setValue($repository->getDetail('herald-disabled', 0))
	->setOptions(
	array(
	0 => 'Enabled - Send Email and Publish Stories',
	1 => 'Disabled - Do Not Send Email or Publish Stories',
	))
	->setCaption(
	'You can disable Herald commit notifications and feed stories '.
	'for this repository. This can be useful when initially importing '.
	'a repository. Feed stories are never published about commits '.
	'that are more than 24 hours old.'));

	if ($is_svn) {
	$inset
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('uuid')
	->setLabel('UUID')
	->setValue($repository->getUUID())
	->setCaption('Repository UUID from <tt>svn info</tt>.'));
	}

	$form->appendChild($inset);

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue('Save Configuration'));

	$panel = new AphrontPanelView();
	$panel->setHeader('Repository Tracking');
	$panel->appendChild($form);
	$panel->setWidth(AphrontPanelView::WIDTH_WIDE);

	$nav = $this->sideNav;
	$nav->appendChild($error_view);
	$nav->appendChild($panel);

	return $this->buildStandardPageResponse(
	$nav,
	array(
	'title' => 'Edit Repository Tracking',
	));
	}

	}
	diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php
	index 2ba2b5fdb0..21ea6948be 100644
	--- a/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php
	+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php
	@@ -1,174 +1,167 @@
	<?php

	/**
	* @group slowvote
	*/
	final class PhabricatorSlowvoteListController
	extends PhabricatorSlowvoteController {

	private $view;

	const VIEW_ALL = 'all';
	const VIEW_CREATED = 'created';
	const VIEW_VOTED = 'voted';

	public function willProcessRequest(array $data) {
	$this->view = idx($data, 'view');
	}

	public function processRequest() {

	$request = $this->getRequest();
	$user = $request->getUser();

	$views = array(
	self::VIEW_ALL => 'All Slowvotes',
	self::VIEW_CREATED => 'Created',
	self::VIEW_VOTED => 'Voted In',
	);

	$view = isset($views[$this->view])
	? $this->view
	: self::VIEW_ALL;

	$side_nav = $this->renderSideNav($views, $view);

	$pager = new AphrontPagerView();
	$pager->setOffset($request->getInt('page'));
	$pager->setURI($request->getRequestURI(), 'page');

	$polls = $this->loadPolls($pager, $view);

	$phids = mpull($polls, 'getAuthorPHID');
	$handles = $this->loadViewerHandles($phids);

	$rows = array();
	foreach ($polls as $poll) {
	$rows[] = array(
	'V'.$poll->getID(),
	phutil_render_tag(
	'a',
	array(
	'href' => '/V'.$poll->getID(),
	),
	phutil_escape_html($poll->getQuestion())),
	$handles[$poll->getAuthorPHID()]->renderLink(),
	phabricator_date($poll->getDateCreated(), $user),
	phabricator_time($poll->getDateCreated(), $user),
	);
	}

	$table = new AphrontTableView($rows);
	$table->setColumnClasses(
	array(
	'',
	'pri wide',
	'',
	'',
	'right',
	));
	$table->setHeaders(
	array(
	'ID',
	'Poll',
	'Author',
	'Date',
	'Time',
	));

	$panel = new AphrontPanelView();
	$panel->setHeader($this->getTableHeader($view));
	$panel->setCreateButton('Create Slowvote', '/vote/create/');
	$panel->appendChild($table);
	$panel->appendChild($pager);

	$side_nav->appendChild($panel);

	return $this->buildStandardPageResponse(
	$side_nav,
	array(
	'title' => 'Slowvotes',
	));
	}

	private function loadPolls(AphrontPagerView $pager, $view) {
	$request = $this->getRequest();
	$user = $request->getUser();

	$poll = new PhabricatorSlowvotePoll();

	$conn = $poll->establishConnection('r');
	$offset = $pager->getOffset();
	$limit = $pager->getPageSize() + 1;

	switch ($view) {
	case self::VIEW_ALL:
	$data = queryfx_all(
	$conn,
	'SELECT * FROM %T ORDER BY id DESC LIMIT %d, %d',
	$poll->getTableName(),
	$offset,
	$limit);
	break;
	case self::VIEW_CREATED:
	$data = queryfx_all(
	$conn,
	'SELECT * FROM %T WHERE authorPHID = %s ORDER BY id DESC
	LIMIT %d, %d',
	$poll->getTableName(),
	$user->getPHID(),
	$offset,
	$limit);
	break;
	case self::VIEW_VOTED:
	$choice = new PhabricatorSlowvoteChoice();
	$data = queryfx_all(
	$conn,
	'SELECT p.* FROM %T p JOIN %T o
	ON o.pollID = p.id
	WHERE o.authorPHID = %s
	GROUP BY p.id
	ORDER BY p.id DESC
	LIMIT %d, %d',
	$poll->getTableName(),
	$choice->getTableName(),
	$user->getPHID(),
	$offset,
	$limit);
	break;
	}

	$data = $pager->sliceResults($data);
	return $poll->loadAllFromArray($data);
	}

	private function renderSideNav(array $views, $view) {
	- $side_nav = new AphrontSideNavView();
	+ $side_nav = new AphrontSideNavFilterView();
	+ $side_nav->setBaseURI(new PhutilURI('/vote/view/'));
	foreach ($views as $key => $name) {
	- $side_nav->addNavItem(
	- phutil_render_tag(
	- 'a',
	- array(
	- 'href' => '/vote/view/'.$key.'/',
	- 'class' => ($view == $key)
	- ? 'aphront-side-nav-selected'
	- : null,
	- ),
	- phutil_escape_html($name)));
	+ $side_nav->addFilter($key, $name);
	}
	+ $side_nav->selectFilter($view, null);
	return $side_nav;
	}

	private function getTableHeader($view) {
	static $headers = array(
	self::VIEW_ALL
	=> 'Slowvotes Not Yet Consumed by the Ravages of Time',
	self::VIEW_CREATED
	=> 'Slowvotes Birthed from Your Noblest of Great Minds',
	self::VIEW_VOTED
	=> 'Slowvotes Within Which You Express Your Mighty Opinion',
	);
	return idx($headers, $view);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Nov 6, 6:19 AM (6 h, 2 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 321691
Default Alt Text: (76 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions