Page MenuHomePhorge
Files F3216024

D25889.1741675886.diff
No OneTemporary
Actions

D25889.1741675886.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4216,13 +4216,15 @@
'PhabricatorPeopleProfileMenuEngine' => 'applications/people/engine/PhabricatorPeopleProfileMenuEngine.php',
'PhabricatorPeopleProfilePictureController' => 'applications/people/controller/PhabricatorPeopleProfilePictureController.php',
'PhabricatorPeopleProfileRevisionsController' => 'applications/people/controller/PhabricatorPeopleProfileRevisionsController.php',
- 'PhabricatorPeopleProfileTasksController' => 'applications/people/controller/PhabricatorPeopleProfileTasksController.php',
+ 'PhabricatorPeopleProfileTasksAssignedController' => 'applications/people/controller/PhabricatorPeopleProfileTasksAssignedController.php',
+ 'PhabricatorPeopleProfileTasksAuthoredController' => 'applications/people/controller/PhabricatorPeopleProfileTasksAuthoredController.php',
'PhabricatorPeopleProfileViewController' => 'applications/people/controller/PhabricatorPeopleProfileViewController.php',
'PhabricatorPeopleQuery' => 'applications/people/query/PhabricatorPeopleQuery.php',
'PhabricatorPeopleRenameController' => 'applications/people/controller/PhabricatorPeopleRenameController.php',
'PhabricatorPeopleRevisionsProfileMenuItem' => 'applications/people/menuitem/PhabricatorPeopleRevisionsProfileMenuItem.php',
'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php',
- 'PhabricatorPeopleTasksProfileMenuItem' => 'applications/people/menuitem/PhabricatorPeopleTasksProfileMenuItem.php',
+ 'PhabricatorPeopleTasksAssignedProfileMenuItem' => 'applications/people/menuitem/PhabricatorPeopleTasksAssignedProfileMenuItem.php',
+ 'PhabricatorPeopleTasksAuthoredProfileMenuItem' => 'applications/people/menuitem/PhabricatorPeopleTasksAuthoredProfileMenuItem.php',
'PhabricatorPeopleTestDataGenerator' => 'applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php',
'PhabricatorPeopleTransactionQuery' => 'applications/people/query/PhabricatorPeopleTransactionQuery.php',
'PhabricatorPeopleUserEmailPHIDType' => 'applications/people/phid/PhabricatorPeopleUserEmailPHIDType.php',
@@ -10812,13 +10814,15 @@
'PhabricatorPeopleProfileMenuEngine' => 'PhabricatorProfileMenuEngine',
'PhabricatorPeopleProfilePictureController' => 'PhabricatorPeopleProfileController',
'PhabricatorPeopleProfileRevisionsController' => 'PhabricatorPeopleProfileController',
- 'PhabricatorPeopleProfileTasksController' => 'PhabricatorPeopleProfileController',
+ 'PhabricatorPeopleProfileTasksAssignedController' => 'PhabricatorPeopleProfileController',
+ 'PhabricatorPeopleProfileTasksAuthoredController' => 'PhabricatorPeopleProfileController',
'PhabricatorPeopleProfileViewController' => 'PhabricatorPeopleProfileController',
'PhabricatorPeopleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'PhabricatorPeopleRenameController' => 'PhabricatorPeopleController',
'PhabricatorPeopleRevisionsProfileMenuItem' => 'PhabricatorProfileMenuItem',
'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine',
- 'PhabricatorPeopleTasksProfileMenuItem' => 'PhabricatorProfileMenuItem',
+ 'PhabricatorPeopleTasksAssignedProfileMenuItem' => 'PhabricatorProfileMenuItem',
+ 'PhabricatorPeopleTasksAuthoredProfileMenuItem' => 'PhabricatorProfileMenuItem',
'PhabricatorPeopleTestDataGenerator' => 'PhabricatorTestDataGenerator',
'PhabricatorPeopleTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
'PhabricatorPeopleUserEmailPHIDType' => 'PhabricatorPHIDType',
diff --git a/src/applications/people/application/PhabricatorPeopleApplication.php b/src/applications/people/application/PhabricatorPeopleApplication.php
--- a/src/applications/people/application/PhabricatorPeopleApplication.php
+++ b/src/applications/people/application/PhabricatorPeopleApplication.php
@@ -68,8 +68,10 @@
'PhabricatorPeopleProfileEditController',
'badges/(?P<id>[1-9]\d*)/' =>
'PhabricatorPeopleProfileBadgesController',
- 'tasks/(?P<id>[1-9]\d*)/' =>
- 'PhabricatorPeopleProfileTasksController',
+ 'tasks-assigned/(?P<id>[1-9]\d*)/' =>
+ 'PhabricatorPeopleProfileTasksAssignedController',
+ 'tasks-authored/(?P<id>[1-9]\d*)/' =>
+ 'PhabricatorPeopleProfileTasksAuthoredController',
'commits/(?P<id>[1-9]\d*)/' =>
'PhabricatorPeopleProfileCommitsController',
'revisions/(?P<id>[1-9]\d*)/' =>
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileTasksController.php b/src/applications/people/controller/PhabricatorPeopleProfileTasksAssignedController.php
rename from src/applications/people/controller/PhabricatorPeopleProfileTasksController.php
rename to src/applications/people/controller/PhabricatorPeopleProfileTasksAssignedController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileTasksController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileTasksAssignedController.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorPeopleProfileTasksController
+final class PhabricatorPeopleProfileTasksAssignedController
extends PhabricatorPeopleProfileController {
public function handleRequest(AphrontRequest $request) {
@@ -34,7 +34,7 @@
$nav = $this->newNavigation(
$user,
- PhabricatorPeopleProfileMenuEngine::ITEM_TASKS);
+ PhabricatorPeopleProfileMenuEngine::ITEM_TASKS_ASSIGNED);
$view = id(new PHUITwoColumnView())
->setHeader($header)
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileTasksController.php b/src/applications/people/controller/PhabricatorPeopleProfileTasksAuthoredController.php
rename from src/applications/people/controller/PhabricatorPeopleProfileTasksController.php
rename to src/applications/people/controller/PhabricatorPeopleProfileTasksAuthoredController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileTasksController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileTasksAuthoredController.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorPeopleProfileTasksController
+final class PhabricatorPeopleProfileTasksAuthoredController
extends PhabricatorPeopleProfileController {
public function handleRequest(AphrontRequest $request) {
@@ -24,17 +24,17 @@
}
$this->setUser($user);
- $title = array(pht('Assigned Tasks'), $user->getUsername());
+ $title = array(pht('Authored Tasks'), $user->getUsername());
$header = $this->buildProfileHeader();
$tasks = $this->buildTasksView($user);
$crumbs = $this->buildApplicationCrumbs();
- $crumbs->addTextCrumb(pht('Assigned Tasks'));
+ $crumbs->addTextCrumb(pht('Authored Tasks'));
$crumbs->setBorder(true);
$nav = $this->newNavigation(
$user,
- PhabricatorPeopleProfileMenuEngine::ITEM_TASKS);
+ PhabricatorPeopleProfileMenuEngine::ITEM_TASKS_ASSIGNED);
$view = id(new PHUITwoColumnView())
->setHeader($header)
@@ -58,11 +58,9 @@
$tasks = id(new ManiphestTaskQuery())
->setViewer($viewer)
- ->withOwners(array($user->getPHID()))
- ->withStatuses($open)
+ ->withAuthors(array($user->getPHID()))
->needProjectPHIDs(true)
->setLimit(100)
- ->setGroupBy(ManiphestTaskQuery::GROUP_PRIORITY)
->execute();
$handles = ManiphestTaskListView::loadTaskHandles($viewer, $tasks);
@@ -71,10 +69,10 @@
->setUser($viewer)
->setHandles($handles)
->setTasks($tasks)
- ->setNoDataString(pht('No open, assigned tasks.'));
+ ->setNoDataString(pht('No authored tasks.'));
$view = id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Assigned Tasks'))
+ ->setHeaderText(pht('Authored Tasks'))
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->appendChild($list);
diff --git a/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
--- a/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
+++ b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
@@ -7,7 +7,8 @@
const ITEM_MANAGE = 'people.manage';
const ITEM_PICTURE = 'people.picture';
const ITEM_BADGES = 'people.badges';
- const ITEM_TASKS = 'people.tasks';
+ const ITEM_TASKS_ASSIGNED = 'people.tasks.assigned';
+ const ITEM_TASKS_AUTHORED = 'people.tasks.authored';
const ITEM_COMMITS = 'people.commits';
const ITEM_REVISIONS = 'people.revisions';
@@ -40,8 +41,13 @@
$viewer);
if ($have_maniphest) {
$items[] = $this->newItem()
- ->setBuiltinKey(self::ITEM_TASKS)
- ->setMenuItemKey(PhabricatorPeopleTasksProfileMenuItem::MENUITEMKEY);
+ ->setBuiltinKey(self::ITEM_TASKS_ASSIGNED)
+ ->setMenuItemKey(
+ PhabricatorPeopleTasksAssignedProfileMenuItem::MENUITEMKEY);
+ $items[] = $this->newItem()
+ ->setBuiltinKey(self::ITEM_TASKS_AUTHORED)
+ ->setMenuItemKey(
+ PhabricatorPeopleTasksAuthoredProfileMenuItem::MENUITEMKEY);
}
$have_differential = PhabricatorApplication::isClassInstalledForViewer(
diff --git a/src/applications/people/menuitem/PhabricatorPeopleBadgesProfileMenuItem.php b/src/applications/people/menuitem/PhabricatorPeopleBadgesProfileMenuItem.php
--- a/src/applications/people/menuitem/PhabricatorPeopleBadgesProfileMenuItem.php
+++ b/src/applications/people/menuitem/PhabricatorPeopleBadgesProfileMenuItem.php
@@ -6,11 +6,11 @@
const MENUITEMKEY = 'people.badges';
public function getMenuItemTypeName() {
- return pht('Badges');
+ return pht('Received Badges');
}
private function getDefaultName() {
- return pht('Badges');
+ return pht('Received Badges');
}
public function canHideMenuItem(
diff --git a/src/applications/people/menuitem/PhabricatorPeopleCommitsProfileMenuItem.php b/src/applications/people/menuitem/PhabricatorPeopleCommitsProfileMenuItem.php
--- a/src/applications/people/menuitem/PhabricatorPeopleCommitsProfileMenuItem.php
+++ b/src/applications/people/menuitem/PhabricatorPeopleCommitsProfileMenuItem.php
@@ -6,11 +6,11 @@
const MENUITEMKEY = 'people.commits';
public function getMenuItemTypeName() {
- return pht('Commits');
+ return pht('Authored Commits');
}
private function getDefaultName() {
- return pht('Commits');
+ return pht('Authored Commits');
}
public function canHideMenuItem(
diff --git a/src/applications/people/menuitem/PhabricatorPeopleDetailsProfileMenuItem.php b/src/applications/people/menuitem/PhabricatorPeopleDetailsProfileMenuItem.php
--- a/src/applications/people/menuitem/PhabricatorPeopleDetailsProfileMenuItem.php
+++ b/src/applications/people/menuitem/PhabricatorPeopleDetailsProfileMenuItem.php
@@ -45,7 +45,7 @@
$item = $this->newItemView()
->setURI($uri)
- ->setName(pht('Profile'))
+ ->setName(pht('User Profile'))
->setIcon('fa-user');
return array(
diff --git a/src/applications/people/menuitem/PhabricatorPeopleManageProfileMenuItem.php b/src/applications/people/menuitem/PhabricatorPeopleManageProfileMenuItem.php
--- a/src/applications/people/menuitem/PhabricatorPeopleManageProfileMenuItem.php
+++ b/src/applications/people/menuitem/PhabricatorPeopleManageProfileMenuItem.php
@@ -10,7 +10,7 @@
}
private function getDefaultName() {
- return pht('Manage');
+ return pht('Manage User');
}
public function canHideMenuItem(
diff --git a/src/applications/people/menuitem/PhabricatorPeopleRevisionsProfileMenuItem.php b/src/applications/people/menuitem/PhabricatorPeopleRevisionsProfileMenuItem.php
--- a/src/applications/people/menuitem/PhabricatorPeopleRevisionsProfileMenuItem.php
+++ b/src/applications/people/menuitem/PhabricatorPeopleRevisionsProfileMenuItem.php
@@ -6,11 +6,11 @@
const MENUITEMKEY = 'people.revisions';
public function getMenuItemTypeName() {
- return pht('Revisions');
+ return pht('Authored Revisions');
}
private function getDefaultName() {
- return pht('Revisions');
+ return pht('Authored Revisions');
}
public function canHideMenuItem(
diff --git a/src/applications/people/menuitem/PhabricatorPeopleTasksProfileMenuItem.php b/src/applications/people/menuitem/PhabricatorPeopleTasksAssignedProfileMenuItem.php
rename from src/applications/people/menuitem/PhabricatorPeopleTasksProfileMenuItem.php
rename to src/applications/people/menuitem/PhabricatorPeopleTasksAssignedProfileMenuItem.php
--- a/src/applications/people/menuitem/PhabricatorPeopleTasksProfileMenuItem.php
+++ b/src/applications/people/menuitem/PhabricatorPeopleTasksAssignedProfileMenuItem.php
@@ -1,16 +1,16 @@
<?php
-final class PhabricatorPeopleTasksProfileMenuItem
+final class PhabricatorPeopleTasksAssignedProfileMenuItem
extends PhabricatorProfileMenuItem {
- const MENUITEMKEY = 'people.tasks';
+ const MENUITEMKEY = 'people.tasks.assigned';
public function getMenuItemTypeName() {
- return pht('Tasks');
+ return pht('Assigned Tasks');
}
private function getDefaultName() {
- return pht('Tasks');
+ return pht('Assigned Tasks');
}
public function canHideMenuItem(
@@ -47,7 +47,7 @@
$id = $user->getID();
$item = $this->newItemView()
- ->setURI("/people/tasks/{$id}/")
+ ->setURI("/people/tasks-assigned/{$id}/")
->setName($this->getDisplayName($config))
->setIcon('fa-anchor');
diff --git a/src/applications/people/menuitem/PhabricatorPeopleTasksProfileMenuItem.php b/src/applications/people/menuitem/PhabricatorPeopleTasksAuthoredProfileMenuItem.php
rename from src/applications/people/menuitem/PhabricatorPeopleTasksProfileMenuItem.php
rename to src/applications/people/menuitem/PhabricatorPeopleTasksAuthoredProfileMenuItem.php
--- a/src/applications/people/menuitem/PhabricatorPeopleTasksProfileMenuItem.php
+++ b/src/applications/people/menuitem/PhabricatorPeopleTasksAuthoredProfileMenuItem.php
@@ -1,16 +1,16 @@
<?php
-final class PhabricatorPeopleTasksProfileMenuItem
+final class PhabricatorPeopleTasksAuthoredProfileMenuItem
extends PhabricatorProfileMenuItem {
- const MENUITEMKEY = 'people.tasks';
+ const MENUITEMKEY = 'people.tasks.authored';
public function getMenuItemTypeName() {
- return pht('Tasks');
+ return pht('Authored Tasks');
}
private function getDefaultName() {
- return pht('Tasks');
+ return pht('Authored Tasks');
}
public function canHideMenuItem(
@@ -47,7 +47,7 @@
$id = $user->getID();
$item = $this->newItemView()
- ->setURI("/people/tasks/{$id}/")
+ ->setURI("/people/tasks-authored/{$id}/")
->setName($this->getDisplayName($config))
->setIcon('fa-anchor');

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 11, 06:51 (1 d, 10 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1223635
Default Alt Text
D25889.1741675886.diff (14 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0