Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15387780
D8145.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
19 KB
Referenced Files
None
Subscribers
None
D8145.id.diff
View Options
Index: resources/sql/autopatches/20140205.cal.1.rename.sql
===================================================================
--- /dev/null
+++ resources/sql/autopatches/20140205.cal.1.rename.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_user.user_status
+ RENAME {$NAMESPACE}_calendar.calendar_event;
Index: src/__phutil_library_map__.php
===================================================================
--- src/__phutil_library_map__.php
+++ src/__phutil_library_map__.php
@@ -1262,6 +1262,9 @@
'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php',
'PhabricatorCalendarDeleteStatusController' => 'applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php',
'PhabricatorCalendarEditStatusController' => 'applications/calendar/controller/PhabricatorCalendarEditStatusController.php',
+ 'PhabricatorCalendarEvent' => 'applications/calendar/storage/PhabricatorCalendarEvent.php',
+ 'PhabricatorCalendarEventInvalidEpochException' => 'applications/calendar/exception/PhabricatorCalendarEventInvalidEpochException.php',
+ 'PhabricatorCalendarEventOverlapException' => 'applications/calendar/exception/PhabricatorCalendarEventOverlapException.php',
'PhabricatorCalendarHoliday' => 'applications/calendar/storage/PhabricatorCalendarHoliday.php',
'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php',
'PhabricatorCalendarViewStatusController' => 'applications/calendar/controller/PhabricatorCalendarViewStatusController.php',
@@ -2136,10 +2139,7 @@
'PhabricatorUserSSHKey' => 'applications/settings/storage/PhabricatorUserSSHKey.php',
'PhabricatorUserSearchIndexer' => 'applications/people/search/PhabricatorUserSearchIndexer.php',
'PhabricatorUserSinceField' => 'applications/people/customfield/PhabricatorUserSinceField.php',
- 'PhabricatorUserStatus' => 'applications/people/storage/PhabricatorUserStatus.php',
'PhabricatorUserStatusField' => 'applications/people/customfield/PhabricatorUserStatusField.php',
- 'PhabricatorUserStatusInvalidEpochException' => 'applications/people/exception/PhabricatorUserStatusInvalidEpochException.php',
- 'PhabricatorUserStatusOverlapException' => 'applications/people/exception/PhabricatorUserStatusOverlapException.php',
'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php',
'PhabricatorUserTitleField' => 'applications/people/customfield/PhabricatorUserTitleField.php',
'PhabricatorUserTransaction' => 'applications/people/storage/PhabricatorUserTransaction.php',
@@ -3900,6 +3900,9 @@
'PhabricatorCalendarDAO' => 'PhabricatorLiskDAO',
'PhabricatorCalendarDeleteStatusController' => 'PhabricatorCalendarController',
'PhabricatorCalendarEditStatusController' => 'PhabricatorCalendarController',
+ 'PhabricatorCalendarEvent' => 'PhabricatorCalendarDAO',
+ 'PhabricatorCalendarEventInvalidEpochException' => 'Exception',
+ 'PhabricatorCalendarEventOverlapException' => 'Exception',
'PhabricatorCalendarHoliday' => 'PhabricatorCalendarDAO',
'PhabricatorCalendarHolidayTestCase' => 'PhabricatorTestCase',
'PhabricatorCalendarViewStatusController' => 'PhabricatorCalendarController',
@@ -4893,10 +4896,7 @@
'PhabricatorUserSSHKey' => 'PhabricatorUserDAO',
'PhabricatorUserSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
'PhabricatorUserSinceField' => 'PhabricatorUserCustomField',
- 'PhabricatorUserStatus' => 'PhabricatorUserDAO',
'PhabricatorUserStatusField' => 'PhabricatorUserCustomField',
- 'PhabricatorUserStatusInvalidEpochException' => 'Exception',
- 'PhabricatorUserStatusOverlapException' => 'Exception',
'PhabricatorUserTestCase' => 'PhabricatorTestCase',
'PhabricatorUserTitleField' => 'PhabricatorUserCustomField',
'PhabricatorUserTransaction' => 'PhabricatorApplicationTransaction',
Index: src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
+++ src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
@@ -19,7 +19,7 @@
"{$year}-{$month}-01",
"{$year}-{$month}-31");
- $statuses = id(new PhabricatorUserStatus())
+ $statuses = id(new PhabricatorCalendarEvent())
->loadAllWhere(
'dateTo >= %d AND dateFrom <= %d',
strtotime("{$year}-{$month}-01"),
Index: src/applications/calendar/controller/PhabricatorCalendarController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarController.php
+++ src/applications/calendar/controller/PhabricatorCalendarController.php
@@ -3,7 +3,7 @@
abstract class PhabricatorCalendarController extends PhabricatorController {
- protected function buildSideNavView(PhabricatorUserStatus $status = null) {
+ protected function buildSideNavView(PhabricatorCalendarEvent $status = null) {
$nav = new AphrontSideNavFilterView();
$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
Index: src/applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php
+++ src/applications/calendar/controller/PhabricatorCalendarDeleteStatusController.php
@@ -12,7 +12,7 @@
public function processRequest() {
$request = $this->getRequest();
$user = $request->getUser();
- $status = id(new PhabricatorUserStatus())
+ $status = id(new PhabricatorCalendarEvent())
->loadOneWhere('id = %d', $this->id);
if (!$status) {
Index: src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
+++ src/applications/calendar/controller/PhabricatorCalendarEditStatusController.php
@@ -30,7 +30,7 @@
->setInitialTime(AphrontFormDateControl::TIME_END_OF_DAY);
if ($this->isCreate()) {
- $status = new PhabricatorUserStatus();
+ $status = new PhabricatorCalendarEvent();
$end_value = $end_time->readValueFromRequest($request);
$start_value = $start_time->readValueFromRequest($request);
$submit_label = pht('Create');
@@ -38,7 +38,7 @@
$page_title = pht('Create Status');
$redirect = 'created';
} else {
- $status = id(new PhabricatorUserStatus())
+ $status = id(new PhabricatorCalendarEvent())
->loadOneWhere('id = %d', $this->id);
$end_time->setValue($status->getDateTo());
$start_time->setValue($status->getDateFrom());
@@ -67,9 +67,9 @@
->setDateTo($end_value)
->setDescription($description)
->save();
- } catch (PhabricatorUserStatusInvalidEpochException $e) {
+ } catch (PhabricatorCalendarEventInvalidEpochException $e) {
$errors[] = pht('Start must be before end.');
- } catch (PhabricatorUserStatusOverlapException $e) {
+ } catch (PhabricatorCalendarEventOverlapException $e) {
$errors[] = pht('There is already a status within the specified '.
'timeframe. Edit or delete this existing status.');
}
Index: src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php
===================================================================
--- src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php
+++ src/applications/calendar/controller/PhabricatorCalendarViewStatusController.php
@@ -16,7 +16,7 @@
$request = $this->getRequest();
$user = $request->getUser();
$handle = $this->getHandle($this->phid);
- $statuses = id(new PhabricatorUserStatus())
+ $statuses = id(new PhabricatorCalendarEvent())
->loadAllWhere('userPHID = %s AND dateTo > UNIX_TIMESTAMP()',
$this->phid);
@@ -43,7 +43,7 @@
}
private function buildStatusList(array $statuses) {
- assert_instances_of($statuses, 'PhabricatorUserStatus');
+ assert_instances_of($statuses, 'PhabricatorCalendarEvent');
$user = $this->getRequest()->getUser();
@@ -66,7 +66,7 @@
$from = phabricator_datetime($status->getDateFrom(), $user);
$to = phabricator_datetime($status->getDateTo(), $user);
- $color = ($status->getStatus() == PhabricatorUserStatus::STATUS_AWAY)
+ $color = ($status->getStatus() == PhabricatorCalendarEvent::STATUS_AWAY)
? 'red'
: 'yellow';
Index: src/applications/calendar/exception/PhabricatorCalendarEventInvalidEpochException.php
===================================================================
--- /dev/null
+++ src/applications/calendar/exception/PhabricatorCalendarEventInvalidEpochException.php
@@ -0,0 +1,4 @@
+<?php
+
+final class PhabricatorCalendarEventInvalidEpochException extends Exception {
+}
Index: src/applications/calendar/exception/PhabricatorCalendarEventOverlapException.php
===================================================================
--- /dev/null
+++ src/applications/calendar/exception/PhabricatorCalendarEventOverlapException.php
@@ -0,0 +1,4 @@
+<?php
+
+final class PhabricatorCalendarEventOverlapException extends Exception {
+}
Index: src/applications/calendar/storage/PhabricatorCalendarEvent.php
===================================================================
--- src/applications/calendar/storage/PhabricatorCalendarEvent.php
+++ src/applications/calendar/storage/PhabricatorCalendarEvent.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorUserStatus extends PhabricatorUserDAO {
+final class PhabricatorCalendarEvent extends PhabricatorCalendarDAO {
protected $userPHID;
protected $dateFrom;
@@ -34,7 +34,7 @@
public function getTerseSummary(PhabricatorUser $viewer) {
$until = phabricator_date($this->dateTo, $viewer);
- if ($this->status == PhabricatorUserStatus::STATUS_SPORADIC) {
+ if ($this->status == PhabricatorCalendarEvent::STATUS_SPORADIC) {
return 'Sporadic until '.$until;
} else {
return 'Away until '.$until;
@@ -65,7 +65,7 @@
public function save() {
if ($this->getDateTo() <= $this->getDateFrom()) {
- throw new PhabricatorUserStatusInvalidEpochException();
+ throw new PhabricatorCalendarEventInvalidEpochException();
}
$this->openTransaction();
@@ -82,7 +82,7 @@
if ($overlap) {
$this->endWriteLocking();
$this->killTransaction();
- throw new PhabricatorUserStatusOverlapException();
+ throw new PhabricatorCalendarEventOverlapException();
}
}
Index: src/applications/conpherence/query/ConpherenceThreadQuery.php
===================================================================
--- src/applications/conpherence/query/ConpherenceThreadQuery.php
+++ src/applications/conpherence/query/ConpherenceThreadQuery.php
@@ -221,7 +221,7 @@
$this->getViewer());
$start_epoch = $epochs['start_epoch'];
$end_epoch = $epochs['end_epoch'];
- $statuses = id(new PhabricatorUserStatus())
+ $statuses = id(new PhabricatorCalendarEvent())
->loadAllWhere(
'userPHID in (%Ls) AND dateTo >= %d AND dateFrom <= %d',
$participant_phids,
Index: src/applications/people/conduit/ConduitAPI_user_Method.php
===================================================================
--- src/applications/people/conduit/ConduitAPI_user_Method.php
+++ src/applications/people/conduit/ConduitAPI_user_Method.php
@@ -12,7 +12,7 @@
protected function buildUserInformationDictionary(
PhabricatorUser $user,
- PhabricatorUserStatus $current_status = null) {
+ PhabricatorCalendarEvent $current_status = null) {
$roles = array();
if ($user->getIsDisabled()) {
Index: src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
===================================================================
--- src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
+++ src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
@@ -42,16 +42,16 @@
$description = $request->getValue('description', '');
try {
- id(new PhabricatorUserStatus())
+ id(new PhabricatorCalendarEvent())
->setUserPHID($user_phid)
->setDateFrom($from)
->setDateTo($to)
->setTextStatus($status)
->setDescription($description)
->save();
- } catch (PhabricatorUserStatusInvalidEpochException $e) {
+ } catch (PhabricatorCalendarEventInvalidEpochException $e) {
throw new ConduitException('ERR-BAD-EPOCH');
- } catch (PhabricatorUserStatusOverlapException $e) {
+ } catch (PhabricatorCalendarEventOverlapException $e) {
throw new ConduitException('ERR-OVERLAP');
}
}
Index: src/applications/people/conduit/ConduitAPI_user_query_Method.php
===================================================================
--- src/applications/people/conduit/ConduitAPI_user_query_Method.php
+++ src/applications/people/conduit/ConduitAPI_user_query_Method.php
@@ -69,7 +69,7 @@
}
$users = $query->execute();
- $statuses = id(new PhabricatorUserStatus())->loadCurrentStatuses(
+ $statuses = id(new PhabricatorCalendarEvent())->loadCurrentStatuses(
mpull($users, 'getPHID'));
$results = array();
Index: src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
===================================================================
--- src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
+++ src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
@@ -39,7 +39,7 @@
throw new ConduitException('ERR-BAD-EPOCH');
}
- $table = new PhabricatorUserStatus();
+ $table = new PhabricatorCalendarEvent();
$table->openTransaction();
$table->beginReadLocking();
@@ -52,7 +52,7 @@
if ($status->getDateFrom() < $from) {
if ($status->getDateTo() > $to) {
// Split the interval.
- id(new PhabricatorUserStatus())
+ id(new PhabricatorCalendarEvent())
->setUserPHID($user_phid)
->setDateFrom($to)
->setDateTo($status->getDateTo())
Index: src/applications/people/customfield/PhabricatorUserStatusField.php
===================================================================
--- src/applications/people/customfield/PhabricatorUserStatusField.php
+++ src/applications/people/customfield/PhabricatorUserStatusField.php
@@ -25,7 +25,7 @@
$user = $this->getObject();
$viewer = $this->requireViewer();
- $statuses = id(new PhabricatorUserStatus())
+ $statuses = id(new PhabricatorCalendarEvent())
->loadCurrentStatuses(array($user->getPHID()));
if (!$statuses) {
return pht('Available');
Index: src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
===================================================================
--- src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
+++ src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
@@ -38,7 +38,7 @@
} else if (!$user->isUserActivated()) {
$hovercard->addField(pht('Account'), pht('Not Activated'));
} else {
- $statuses = id(new PhabricatorUserStatus())->loadCurrentStatuses(
+ $statuses = id(new PhabricatorCalendarEvent())->loadCurrentStatuses(
array($user->getPHID()));
if ($statuses) {
$current_status = reset($statuses);
Index: src/applications/people/exception/PhabricatorUserStatusInvalidEpochException.php
===================================================================
--- src/applications/people/exception/PhabricatorUserStatusInvalidEpochException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-final class PhabricatorUserStatusInvalidEpochException extends Exception {
-}
Index: src/applications/people/exception/PhabricatorUserStatusOverlapException.php
===================================================================
--- src/applications/people/exception/PhabricatorUserStatusOverlapException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-final class PhabricatorUserStatusOverlapException extends Exception {
-}
Index: src/applications/people/query/PhabricatorPeopleQuery.php
===================================================================
--- src/applications/people/query/PhabricatorPeopleQuery.php
+++ src/applications/people/query/PhabricatorPeopleQuery.php
@@ -167,7 +167,7 @@
if ($this->needStatus) {
$user_list = mpull($users, null, 'getPHID');
- $statuses = id(new PhabricatorUserStatus())->loadCurrentStatuses(
+ $statuses = id(new PhabricatorCalendarEvent())->loadCurrentStatuses(
array_keys($user_list));
foreach ($user_list as $phid => $user) {
$status = idx($statuses, $phid);
Index: src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php
===================================================================
--- src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php
+++ src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php
@@ -76,7 +76,7 @@
->execute();
if ($users) {
- $user_statuses = id(new PhabricatorUserStatus())
+ $user_statuses = id(new PhabricatorCalendarEvent())
->loadCurrentStatuses(mpull($users, 'getPHID'));
$user_statuses = mpull($user_statuses, null, 'getUserPHID');
} else {
@@ -113,9 +113,9 @@
$status = idx($user_statuses, $user->getPHID());
if ($status) {
$status = $status->getStatus();
- if ($status == PhabricatorUserStatus::STATUS_AWAY) {
+ if ($status == PhabricatorCalendarEvent::STATUS_AWAY) {
$tag->setDotColor(PHUITagView::COLOR_RED);
- } else if ($status == PhabricatorUserStatus::STATUS_AWAY) {
+ } else if ($status == PhabricatorCalendarEvent::STATUS_AWAY) {
$tag->setDotColor(PHUITagView::COLOR_ORANGE);
}
}
Index: src/applications/people/storage/PhabricatorUser.php
===================================================================
--- src/applications/people/storage/PhabricatorUser.php
+++ src/applications/people/storage/PhabricatorUser.php
@@ -609,14 +609,13 @@
return celerity_get_resource_uri('/rsrc/image/avatar.png');
}
- public function attachStatus(PhabricatorUserStatus $status) {
+ public function attachStatus(PhabricatorCalendarEvent $status) {
$this->status = $status;
return $this;
}
public function getStatus() {
- $this->assertAttached($this->status);
- return $this->status;
+ return $this->assertAttached($this->status);
}
public function hasStatus() {
Index: src/infrastructure/storage/lisk/LiskDAO.php
===================================================================
--- src/infrastructure/storage/lisk/LiskDAO.php
+++ src/infrastructure/storage/lisk/LiskDAO.php
@@ -775,7 +775,7 @@
* row in retrieving other rows. Example of a correct usage:
*
* $status = $author->loadOneRelative(
- * new PhabricatorUserStatus(),
+ * new PhabricatorCalendarEvent(),
* 'userPHID',
* 'getPHID',
* '(UNIX_TIMESTAMP() BETWEEN dateFrom AND dateTo)');
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Mar 16, 2:54 AM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7225848
Default Alt Text
D8145.id.diff (19 KB)
Attached To
Mode
D8145: Rename PhabricatorUserStatus to PhabricatorCalendarEvent
Attached
Detach File
Event Timeline
Log In to Comment