No OneTemporary
Actions

Size

8 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/macro/controller/PhabricatorMacroListController.php b/src/applications/macro/controller/PhabricatorMacroListController.php
	index 0ed1bebc77..68d395ecfe 100644
	--- a/src/applications/macro/controller/PhabricatorMacroListController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroListController.php
	@@ -1,165 +1,165 @@
	<?php

	final class PhabricatorMacroListController
	extends PhabricatorMacroController {

	public function processRequest() {

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

	$macro_table = new PhabricatorFileImageMacro();
	$file_table = new PhabricatorFile();
	$conn = $macro_table->establishConnection('r');

	$where = array();

	$join = array();
	$join[] = qsprintf($conn, '%T m', $macro_table->getTableName());

	$filter = $request->getStr('name');
	if (strlen($filter)) {
	$where[] = qsprintf($conn, 'm.name LIKE %~', $filter);
	}

	$authors = $request->getArr('authors');
	if ($authors) {
	$join[] = qsprintf(
	$conn,
	'%T f ON m.filePHID = f.phid',
	$file_table->getTableName());
	$where[] = qsprintf($conn, 'f.authorPHID IN (%Ls)', $authors);
	}

	$has_search = $where;

	if ($has_search) {
	$macros = queryfx_all(
	$conn,
	'SELECT m.* FROM %Q WHERE %Q',
	implode(' JOIN ', $join),
	implode(' AND ', $where));
	$macros = $macro_table->loadAllFromArray($macros);
	$nodata = pht('There are no macros matching the filter.');
	} else {
	$pager = new AphrontPagerView();
	$pager->setOffset($request->getInt('page'));

	$macros = $macro_table->loadAllWhere(
	'1 = 1 ORDER BY id DESC LIMIT %d, %d',
	$pager->getOffset(),
	$pager->getPageSize());

	// Get an exact count since the size here is reasonably going to be a few
	// thousand at most in any reasonable case.
	$count = queryfx_one(
	$conn,
	'SELECT COUNT(*) N FROM %T',
	$macro_table->getTableName());
	$count = $count['N'];

	$pager->setCount($count);
	$pager->setURI($request->getRequestURI(), 'page');

	$nodata = pht('There are no image macros yet.');
	}

	if ($authors) {
	$author_phids = array_fuse($authors);
	} else {
	$author_phids = array();
	}

	$file_phids = mpull($macros, 'getFilePHID');

	$files = array();
	if ($file_phids) {
	$files = $file_table->loadAllWhere(
	"phid IN (%Ls)",
	$file_phids);
	$author_phids += mpull($files, 'getAuthorPHID', 'getAuthorPHID');
	}
	$files_map = mpull($files, null, 'getPHID');

	$this->loadHandles($author_phids);
	$author_handles = array_select_keys($this->getLoadedHandles(), $authors);

	$filter_form = id(new AphrontFormView())
	->setMethod('GET')
	->setUser($request->getUser())
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('name')
	->setLabel(pht('Name'))
	->setValue($filter))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setName('authors')
	->setLabel(pht('Authors'))
	->setDatasource('/typeahead/common/users/')
	->setValue(mpull($author_handles, 'getFullName')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Filter Image Macros')));

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

	$nav = $this->buildSideNavView(
	$for_app = false,
	$has_search);
	$nav->selectFilter($has_search ? 'search' : '/');

	$nav->appendChild($filter_view);

	$pinboard = new PhabricatorPinboardView();
	$pinboard->setNoDataString($nodata);
	foreach ($macros as $macro) {
	$file_phid = $macro->getFilePHID();
	$file = idx($files_map, $file_phid);

	$item = new PhabricatorPinboardItemView();
	if ($file) {
	$item->setImageURI($file->getThumb220x165URI());
	$item->setImageSize(220, 165);
	if ($file->getAuthorPHID()) {
	$author_handle = $this->getHandle($file->getAuthorPHID());
	$item->appendChild(
	- 'Created by '.$author_handle->renderLink());
	+ pht('Created by %s', $author_handle->renderLink()));
	}
	$datetime = phabricator_date($file->getDateCreated(), $viewer);
	$item->appendChild(
	phutil_tag(
	'div',
	array(),
	pht('Created on %s', $datetime)));
	}
	$item->setURI($this->getApplicationURI('/view/'.$macro->getID().'/'));
	$item->setHeader($macro->getName());

	$pinboard->addItem($item);
	}
	$nav->appendChild($pinboard);

	if (!$has_search) {
	$nav->appendChild($pager);
	$name = pht('All Macros');
	} else {
	$name = pht('Search');
	}

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName($name)
	->setHref($request->getRequestURI()));
	$nav->setCrumbs($crumbs);

	return $this->buildApplicationPage(
	$nav,
	array(
	'device' => true,
	'title' => pht('Image Macros'),
	));
	}
	}
	diff --git a/src/view/layout/PhabricatorPinboardItemView.php b/src/view/layout/PhabricatorPinboardItemView.php
	index 76cf5104ba..683a6cf4dd 100644
	--- a/src/view/layout/PhabricatorPinboardItemView.php
	+++ b/src/view/layout/PhabricatorPinboardItemView.php
	@@ -1,77 +1,81 @@
	<?php

	final class PhabricatorPinboardItemView extends AphrontView {

	private $imageURI;
	private $uri;
	private $header;

	private $imageWidth;
	private $imageHeight;

	public function setHeader($header) {
	$this->header = $header;
	return $this;
	}

	public function setURI($uri) {
	$this->uri = $uri;
	return $this;
	}

	public function setImageURI($image_uri) {
	$this->imageURI = $image_uri;
	return $this;
	}

	public function setImageSize($x, $y) {
	$this->imageWidth = $x;
	$this->imageHeight = $y;
	return $this;
	}

	public function render() {
	$header = null;
	if ($this->header) {
	- $header = hsprintf('<a href="%s">%s</a>', $this->uri, $this->header);
	$header = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-pinboard-item-header',
	),
	- $header);
	+ phutil_tag('a', array('href' => $this->uri), $this->header));
	}

	$image = phutil_tag(
	'a',
	array(
	'href' => $this->uri,
	'class' => 'phabricator-pinboard-item-image-link',
	),
	phutil_tag(
	'img',
	array(
	'src' => $this->imageURI,
	'width' => $this->imageWidth,
	'height' => $this->imageHeight,
	)));

	- $content = $this->renderChildren();
	+ $content = $this->renderHTMLChildren();
	if ($content) {
	- $content = phutil_render_tag(
	+ $content = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-pinboard-item-content',
	),
	$content);
	}

	return phutil_tag(
	'div',
	array(
	'class' => 'phabricator-pinboard-item-view',
	),
	- array($header, $image, $content));
	+ $this->renderHTMLView(
	+ array(
	+ $header,
	+ $image,
	+ $content,
	+ )));
	}

	}
	diff --git a/src/view/layout/PhabricatorPinboardView.php b/src/view/layout/PhabricatorPinboardView.php
	index 1fa98fe14a..a776025c20 100644
	--- a/src/view/layout/PhabricatorPinboardView.php
	+++ b/src/view/layout/PhabricatorPinboardView.php
	@@ -1,37 +1,37 @@
	<?php

	final class PhabricatorPinboardView extends AphrontView {

	private $items = array();
	private $noDataString;

	public function setNoDataString($no_data_string) {
	$this->noDataString = $no_data_string;
	return $this;
	}

	public function addItem(PhabricatorPinboardItemView $item) {
	$this->items[] = $item;
	return $this;
	}

	public function render() {
	require_celerity_resource('phabricator-pinboard-view-css');

	if (!$this->items) {
	$string = nonempty($this->noDataString, pht('No data.'));
	return id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_NODATA)
	->appendChild(phutil_escape_html($string))
	->render();
	}

	- return phutil_render_tag(
	+ return phutil_tag(
	'div',
	array(
	'class' => 'phabricator-pinboard-view',
	),
	- $this->renderSingleView($this->items));
	+ $this->renderHTMLView($this->items));
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 16:54 (2 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1126683
Default Alt Text: (8 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions