mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-01 03:02:43 +01:00
3c8d88deb4
Summary: Fixes T5144. This was incorrectly checking the //content// version, not the //head// version, so reverts would raise the "conflict" warning. Also fix a couple of FontAwesome icons. Test Plan: - Edited a document. - Reverted a document. - Opened two edit tabs. Edited one, tried to edit #2, got a warning. - Opened two revert tabs. Reverted in one, tried to revert in #2, got a warning. Reviewers: btrahan, chad Reviewed By: chad Subscribers: epriestley Maniphest Tasks: T5144 Differential Revision: https://secure.phabricator.com/D9249
171 lines
4.7 KiB
PHP
171 lines
4.7 KiB
PHP
<?php
|
|
|
|
final class PhrictionHistoryController
|
|
extends PhrictionController {
|
|
|
|
private $slug;
|
|
|
|
public function willProcessRequest(array $data) {
|
|
$this->slug = $data['slug'];
|
|
}
|
|
|
|
public function processRequest() {
|
|
|
|
$request = $this->getRequest();
|
|
$user = $request->getUser();
|
|
|
|
$document = id(new PhrictionDocumentQuery())
|
|
->setViewer($user)
|
|
->withSlugs(array(PhabricatorSlug::normalize($this->slug)))
|
|
->needContent(true)
|
|
->executeOne();
|
|
if (!$document) {
|
|
return new Aphront404Response();
|
|
}
|
|
|
|
$current = $document->getContent();
|
|
|
|
$pager = new AphrontPagerView();
|
|
$pager->setOffset($request->getInt('page'));
|
|
$pager->setURI($request->getRequestURI(), 'page');
|
|
|
|
$history = id(new PhrictionContent())->loadAllWhere(
|
|
'documentID = %d ORDER BY version DESC LIMIT %d, %d',
|
|
$document->getID(),
|
|
$pager->getOffset(),
|
|
$pager->getPageSize() + 1);
|
|
$history = $pager->sliceResults($history);
|
|
|
|
$author_phids = mpull($history, 'getAuthorPHID');
|
|
$handles = $this->loadViewerHandles($author_phids);
|
|
|
|
$list = new PHUIObjectItemListView();
|
|
$list->setCards(true);
|
|
$list->setFlush(true);
|
|
|
|
foreach ($history as $content) {
|
|
|
|
$author = $handles[$content->getAuthorPHID()]->renderLink();
|
|
$slug_uri = PhrictionDocument::getSlugURI($document->getSlug());
|
|
$version = $content->getVersion();
|
|
|
|
$diff_uri = new PhutilURI('/phriction/diff/'.$document->getID().'/');
|
|
|
|
$vs_previous = null;
|
|
if ($content->getVersion() != 1) {
|
|
$vs_previous = $diff_uri
|
|
->alter('l', $content->getVersion() - 1)
|
|
->alter('r', $content->getVersion());
|
|
}
|
|
|
|
$vs_head = null;
|
|
if ($content->getID() != $document->getContentID()) {
|
|
$vs_head = $diff_uri
|
|
->alter('l', $content->getVersion())
|
|
->alter('r', $current->getVersion());
|
|
}
|
|
|
|
$change_type = PhrictionChangeType::getChangeTypeLabel(
|
|
$content->getChangeType());
|
|
switch ($content->getChangeType()) {
|
|
case PhrictionChangeType::CHANGE_DELETE:
|
|
$color = 'red';
|
|
break;
|
|
case PhrictionChangeType::CHANGE_EDIT:
|
|
$color = 'blue';
|
|
break;
|
|
case PhrictionChangeType::CHANGE_MOVE_HERE:
|
|
$color = 'yellow';
|
|
break;
|
|
case PhrictionChangeType::CHANGE_MOVE_AWAY:
|
|
$color = 'orange';
|
|
break;
|
|
case PhrictionChangeType::CHANGE_STUB:
|
|
$color = 'green';
|
|
break;
|
|
default:
|
|
throw new Exception("Unknown change type!");
|
|
break;
|
|
}
|
|
|
|
$item = id(new PHUIObjectItemView())
|
|
->setHeader(pht('%s by %s', $change_type, $author))
|
|
->setBarColor($color)
|
|
->addAttribute(
|
|
phutil_tag(
|
|
'a',
|
|
array(
|
|
'href' => $slug_uri.'?v='.$version,
|
|
),
|
|
pht('Version %s', $version)))
|
|
->addAttribute(pht('%s %s',
|
|
phabricator_date($content->getDateCreated(), $user),
|
|
phabricator_time($content->getDateCreated(), $user)));
|
|
|
|
if ($content->getDescription()) {
|
|
$item->addAttribute($content->getDescription());
|
|
}
|
|
|
|
if ($vs_previous) {
|
|
$item->addIcon(
|
|
'fa-reply',
|
|
pht('Show Change'),
|
|
array(
|
|
'href' => $vs_previous,
|
|
));
|
|
} else {
|
|
$item->addIcon(
|
|
'fa-reply grey',
|
|
phutil_tag('em', array(), pht('No previous change')));
|
|
}
|
|
|
|
if ($vs_head) {
|
|
$item->addIcon(
|
|
'fa-reply-all',
|
|
pht('Show Later Changes'),
|
|
array(
|
|
'href' => $vs_head,
|
|
));
|
|
} else {
|
|
$item->addIcon(
|
|
'fa-reply-all grey',
|
|
phutil_tag('em', array(), pht('No later changes')));
|
|
}
|
|
|
|
$list->addItem($item);
|
|
}
|
|
|
|
$crumbs = $this->buildApplicationCrumbs();
|
|
$crumb_views = $this->renderBreadcrumbs($document->getSlug());
|
|
foreach ($crumb_views as $view) {
|
|
$crumbs->addCrumb($view);
|
|
}
|
|
$crumbs->addTextCrumb(
|
|
pht('History'),
|
|
PhrictionDocument::getSlugURI($document->getSlug(), 'history'));
|
|
|
|
$header = new PHUIHeaderView();
|
|
$header->setHeader(pht('Document History for %s',
|
|
phutil_tag(
|
|
'a',
|
|
array('href' => PhrictionDocument::getSlugURI($document->getSlug())),
|
|
head($history)->getTitle())));
|
|
|
|
$obj_box = id(new PHUIObjectBoxView())
|
|
->setHeader($header)
|
|
->appendChild($list)
|
|
->appendChild($pager);
|
|
|
|
return $this->buildApplicationPage(
|
|
array(
|
|
$crumbs,
|
|
$obj_box,
|
|
),
|
|
array(
|
|
'title' => pht('Document History'),
|
|
'device' => true,
|
|
));
|
|
|
|
}
|
|
|
|
}
|