mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-19 05:12:41 +01:00
Deprecating BrowseController and getting rid of unneeded calls to getTerseSummary()
and getHumanStatus()
Summary: Ref T8050, Deprecating BrowseController and getting rid of unneeded calls to `getTerseSummary()` and `getHumanStatus()` Test Plan: Use calendar, make sure nothing explodes Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: Korvin, epriestley Maniphest Tasks: T8050 Differential Revision: https://secure.phabricator.com/D12791
This commit is contained in:
parent
2e54b3ff57
commit
51facbabba
3 changed files with 1 additions and 106 deletions
|
@ -1,97 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
final class PhabricatorCalendarBrowseController
|
|
||||||
extends PhabricatorCalendarController {
|
|
||||||
|
|
||||||
public function shouldAllowPublic() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function handleRequest(AphrontRequest $request) {
|
|
||||||
$viewer = $this->getViewer();
|
|
||||||
|
|
||||||
$now = time();
|
|
||||||
$year_d = phabricator_format_local_time($now, $viewer, 'Y');
|
|
||||||
$year = $request->getInt('year', $year_d);
|
|
||||||
$month_d = phabricator_format_local_time($now, $viewer, 'm');
|
|
||||||
$month = $request->getInt('month', $month_d);
|
|
||||||
$day = phabricator_format_local_time($now, $viewer, 'j');
|
|
||||||
|
|
||||||
$holidays = id(new PhabricatorCalendarHoliday())->loadAllWhere(
|
|
||||||
'day BETWEEN %s AND %s',
|
|
||||||
"{$year}-{$month}-01",
|
|
||||||
"{$year}-{$month}-31");
|
|
||||||
|
|
||||||
$statuses = id(new PhabricatorCalendarEventQuery())
|
|
||||||
->setViewer($viewer)
|
|
||||||
->withDateRange(
|
|
||||||
strtotime("{$year}-{$month}-01"),
|
|
||||||
strtotime("{$year}-{$month}-01 next month"))
|
|
||||||
->execute();
|
|
||||||
|
|
||||||
if ($month == $month_d && $year == $year_d) {
|
|
||||||
$month_view = new PHUICalendarMonthView($month, $year, $day);
|
|
||||||
} else {
|
|
||||||
$month_view = new PHUICalendarMonthView($month, $year);
|
|
||||||
}
|
|
||||||
|
|
||||||
$month_view->setBrowseURI($request->getRequestURI());
|
|
||||||
$month_view->setUser($viewer);
|
|
||||||
$month_view->setHolidays($holidays);
|
|
||||||
|
|
||||||
$phids = mpull($statuses, 'getUserPHID');
|
|
||||||
$handles = $viewer->loadHandles($phids);
|
|
||||||
|
|
||||||
/* Assign Colors */
|
|
||||||
$unique = array_unique($phids);
|
|
||||||
$allblue = false;
|
|
||||||
$calcolors = CalendarColors::getColors();
|
|
||||||
if (count($unique) > count($calcolors)) {
|
|
||||||
$allblue = true;
|
|
||||||
}
|
|
||||||
$i = 0;
|
|
||||||
$eventcolor = array();
|
|
||||||
foreach ($unique as $phid) {
|
|
||||||
if ($allblue) {
|
|
||||||
$eventcolor[$phid] = CalendarColors::COLOR_SKY;
|
|
||||||
} else {
|
|
||||||
$eventcolor[$phid] = $calcolors[$i];
|
|
||||||
}
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($statuses as $status) {
|
|
||||||
$event = new AphrontCalendarEventView();
|
|
||||||
$event->setEpochRange($status->getDateFrom(), $status->getDateTo());
|
|
||||||
|
|
||||||
$name_text = $handles[$status->getUserPHID()]->getName();
|
|
||||||
$status_text = $status->getHumanStatus();
|
|
||||||
$event->setUserPHID($status->getUserPHID());
|
|
||||||
$event->setDescription(pht('%s (%s)', $name_text, $status_text));
|
|
||||||
$event->setName($status_text);
|
|
||||||
$event->setEventID($status->getID());
|
|
||||||
$event->setColor($eventcolor[$status->getUserPHID()]);
|
|
||||||
$month_view->addEvent($event);
|
|
||||||
}
|
|
||||||
|
|
||||||
$date = new DateTime("{$year}-{$month}-01");
|
|
||||||
$crumbs = $this->buildApplicationCrumbs();
|
|
||||||
$crumbs->addTextCrumb(pht('All Events'));
|
|
||||||
$crumbs->addTextCrumb($date->format('F Y'));
|
|
||||||
|
|
||||||
$nav = $this->buildSideNavView();
|
|
||||||
$nav->selectFilter('all/');
|
|
||||||
$nav->appendChild(
|
|
||||||
array(
|
|
||||||
$crumbs,
|
|
||||||
$month_view,
|
|
||||||
));
|
|
||||||
|
|
||||||
return $this->buildApplicationPage(
|
|
||||||
$nav,
|
|
||||||
array(
|
|
||||||
'title' => pht('Calendar'),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -284,15 +284,12 @@ final class PhabricatorCalendarEventSearchEngine
|
||||||
$to = phabricator_datetime($event->getDateTo(), $viewer);
|
$to = phabricator_datetime($event->getDateTo(), $viewer);
|
||||||
$creator_handle = $handles[$event->getUserPHID()];
|
$creator_handle = $handles[$event->getUserPHID()];
|
||||||
|
|
||||||
$name = (strlen($event->getName())) ?
|
|
||||||
$event->getName() : $event->getTerseSummary($viewer);
|
|
||||||
|
|
||||||
$color = ($event->getStatus() == PhabricatorCalendarEvent::STATUS_AWAY)
|
$color = ($event->getStatus() == PhabricatorCalendarEvent::STATUS_AWAY)
|
||||||
? 'red'
|
? 'red'
|
||||||
: 'yellow';
|
: 'yellow';
|
||||||
|
|
||||||
$item = id(new PHUIObjectItemView())
|
$item = id(new PHUIObjectItemView())
|
||||||
->setHeader($name)
|
->setHeader($event->getName())
|
||||||
->setHref($href)
|
->setHref($href)
|
||||||
->setBarColor($color)
|
->setBarColor($color)
|
||||||
->addByline(pht('Creator: %s', $creator_handle->renderLink()))
|
->addByline(pht('Creator: %s', $creator_handle->renderLink()))
|
||||||
|
|
|
@ -168,11 +168,6 @@ final class PhabricatorCalendarEvent extends PhabricatorCalendarDAO
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHumanStatus() {
|
|
||||||
$options = $this->getStatusOptions();
|
|
||||||
return $options[$this->status];
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getConfiguration() {
|
protected function getConfiguration() {
|
||||||
return array(
|
return array(
|
||||||
self::CONFIG_AUX_PHID => true,
|
self::CONFIG_AUX_PHID => true,
|
||||||
|
|
Loading…
Reference in a new issue