Page MenuHomePhabricator
Files F91872

D7365.diff
All Users
Actions

D7365.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
@@ -297,7 +297,7 @@
'DefaultDatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php',
'DifferentialAction' => 'applications/differential/constants/DifferentialAction.php',
'DifferentialActionHasNoEffectException' => 'applications/differential/exception/DifferentialActionHasNoEffectException.php',
- 'DifferentialActionMenuEventListener' => 'applications/differential/events/DifferentialActionMenuEventListener.php',
+ 'DifferentialActionMenuEventListener' => 'applications/differential/event/DifferentialActionMenuEventListener.php',
'DifferentialAddCommentView' => 'applications/differential/view/DifferentialAddCommentView.php',
'DifferentialAffectedPath' => 'applications/differential/storage/DifferentialAffectedPath.php',
'DifferentialApplyPatchFieldSpecification' => 'applications/differential/field/specification/DifferentialApplyPatchFieldSpecification.php',
@@ -368,7 +368,7 @@
'DifferentialFreeformFieldTestCase' => 'applications/differential/field/specification/__tests__/DifferentialFreeformFieldTestCase.php',
'DifferentialGitSVNIDFieldSpecification' => 'applications/differential/field/specification/DifferentialGitSVNIDFieldSpecification.php',
'DifferentialHostFieldSpecification' => 'applications/differential/field/specification/DifferentialHostFieldSpecification.php',
- 'DifferentialHovercardEventListener' => 'applications/differential/events/DifferentialHovercardEventListener.php',
+ 'DifferentialHovercardEventListener' => 'applications/differential/event/DifferentialHovercardEventListener.php',
'DifferentialHunk' => 'applications/differential/storage/DifferentialHunk.php',
'DifferentialHunkParser' => 'applications/differential/parser/DifferentialHunkParser.php',
'DifferentialHunkParserTestCase' => 'applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php',
@@ -1876,6 +1876,7 @@
'PhluxVariableEditor' => 'applications/phlux/editor/PhluxVariableEditor.php',
'PhluxVariableQuery' => 'applications/phlux/query/PhluxVariableQuery.php',
'PhluxViewController' => 'applications/phlux/controller/PhluxViewController.php',
+ 'PholioActionMenuEventListener' => 'applications/pholio/event/PholioActionMenuEventListener.php',
'PholioConstants' => 'applications/pholio/constants/PholioConstants.php',
'PholioController' => 'applications/pholio/controller/PholioController.php',
'PholioDAO' => 'applications/pholio/storage/PholioDAO.php',
@@ -4122,6 +4123,7 @@
'PhluxVariableEditor' => 'PhabricatorApplicationTransactionEditor',
'PhluxVariableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'PhluxViewController' => 'PhluxController',
+ 'PholioActionMenuEventListener' => 'PhabricatorEventListener',
'PholioController' => 'PhabricatorController',
'PholioDAO' => 'PhabricatorLiskDAO',
'PholioImage' =>
diff --git a/src/applications/audit/events/AuditActionMenuEventListener.php b/src/applications/audit/events/AuditActionMenuEventListener.php
--- a/src/applications/audit/events/AuditActionMenuEventListener.php
+++ b/src/applications/audit/events/AuditActionMenuEventListener.php
@@ -14,24 +14,32 @@
}
}
- private function handleActionsEvent($event) {
- $person = $event->getValue('object');
- if (!($person instanceof PhabricatorUser)) {
- return;
+ private function handleActionsEvent(PhutilEvent $event) {
+ $object = $event->getValue('object');
+
+ $actions = null;
+ if ($object instanceof PhabricatorUser) {
+ $actions = $this->renderUserItems($event);
+ }
+
+ $this->addActionMenuItems($event, $actions);
+ }
+
+ private function renderUserItems(PhutilEvent $event) {
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
}
- $actions = $event->getValue('actions');
+ $user = $event->getValue('object');
- $username = phutil_escape_uri($person->getUsername());
- $href = '/audit/view/author/'.$username.'/';
+ $username = phutil_escape_uri($user->getUsername());
+ $view_uri = '/audit/view/author/'.$username.'/';
- $actions[] = id(new PhabricatorActionView())
+ return id(new PhabricatorActionView())
->setIcon('audit-dark')
->setIconSheet(PHUIIconView::SPRITE_APPS)
->setName(pht('View Commits'))
- ->setHref($href);
-
- $event->setValue('actions', $actions);
+ ->setHref($view_uri);
}
}
diff --git a/src/applications/conpherence/events/ConpherenceActionMenuEventListener.php b/src/applications/conpherence/events/ConpherenceActionMenuEventListener.php
--- a/src/applications/conpherence/events/ConpherenceActionMenuEventListener.php
+++ b/src/applications/conpherence/events/ConpherenceActionMenuEventListener.php
@@ -15,23 +15,30 @@
}
}
- private function handleActionsEvent($event) {
- $person = $event->getValue('object');
- if (!($person instanceof PhabricatorUser)) {
- return;
+ private function handleActionsEvent(PhutilEvent $event) {
+ $object = $event->getValue('object');
+
+ $actions = null;
+ if ($object instanceof PhabricatorUser) {
+ $actions = $this->renderUserItems($event);
}
- $href = '/conpherence/new/?participant='.$person->getPHID();
+ $this->addActionMenuItems($event, $actions);
+ }
- $actions = $event->getValue('actions');
+ private function renderUserItems(PhutilEvent $event) {
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
+ }
- $actions[] = id(new PhabricatorActionView())
+ $user = $event->getValue('object');
+ $href = '/conpherence/new/?participant='.$user->getPHID();
+
+ return id(new PhabricatorActionView())
->setIcon('message')
->setName(pht('Send Message'))
->setWorkflow(true)
->setHref($href);
-
- $event->setValue('actions', $actions);
}
}
diff --git a/src/applications/differential/event/DifferentialActionMenuEventListener.php b/src/applications/differential/event/DifferentialActionMenuEventListener.php
new file mode 100644
--- /dev/null
+++ b/src/applications/differential/event/DifferentialActionMenuEventListener.php
@@ -0,0 +1,70 @@
+<?php
+
+final class DifferentialActionMenuEventListener
+ extends PhabricatorEventListener {
+
+ public function register() {
+ $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS);
+ }
+
+ public function handleEvent(PhutilEvent $event) {
+ switch ($event->getType()) {
+ case PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS:
+ $this->handleActionsEvent($event);
+ break;
+ }
+ }
+
+ private function handleActionsEvent(PhutilEvent $event) {
+ $object = $event->getValue('object');
+
+ $actions = null;
+ if ($object instanceof PhabricatorUser) {
+ $actions = $this->renderUserItems($event);
+ } else if ($object instanceof ManiphestTask) {
+ $actions = $this->renderTaskItems($event);
+ }
+
+ $this->addActionMenuItems($event, $actions);
+ }
+
+ private function renderUserItems(PhutilEvent $event) {
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
+ }
+
+ $person = $event->getValue('object');
+ $href = '/differential/?authorPHIDs[]='.$person->getPHID();
+
+ return id(new PhabricatorActionView())
+ ->setRenderAsForm(true)
+ ->setIcon('differential-dark')
+ ->setIconSheet(PHUIIconView::SPRITE_APPS)
+ ->setName(pht('View Revisions'))
+ ->setHref($href);
+ }
+
+ private function renderTaskItems(PhutilEvent $event) {
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
+ }
+
+ $task = $event->getValue('object');
+ $phid = $task->getPHID();
+
+ $can_edit = PhabricatorPolicyFilter::hasCapability(
+ $event->getUser(),
+ $task,
+ PhabricatorPolicyCapability::CAN_EDIT);
+
+ return id(new PhabricatorActionView())
+ ->setName(pht('Edit Differential Revisions'))
+ ->setHref("/search/attach/{$phid}/DREV/")
+ ->setWorkflow(true)
+ ->setIcon('attach')
+ ->setDisabled(!$can_edit)
+ ->setWorkflow(true);
+ }
+
+}
+
diff --git a/src/applications/differential/events/DifferentialHovercardEventListener.php b/src/applications/differential/event/DifferentialHovercardEventListener.php
rename from src/applications/differential/events/DifferentialHovercardEventListener.php
rename to src/applications/differential/event/DifferentialHovercardEventListener.php
diff --git a/src/applications/differential/events/DifferentialActionMenuEventListener.php b/src/applications/differential/events/DifferentialActionMenuEventListener.php
deleted file mode 100644
--- a/src/applications/differential/events/DifferentialActionMenuEventListener.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-final class DifferentialActionMenuEventListener
- extends PhabricatorEventListener {
-
- public function register() {
- $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS);
- }
-
- public function handleEvent(PhutilEvent $event) {
- switch ($event->getType()) {
- case PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS:
- $this->handleActionsEvent($event);
- break;
- }
- }
-
- private function handleActionsEvent($event) {
- $person = $event->getValue('object');
- if (!($person instanceof PhabricatorUser)) {
- return;
- }
-
- $href = '/differential/?authorPHIDs[]='.$person->getPHID();
-
- $actions = $event->getValue('actions');
-
- $actions[] = id(new PhabricatorActionView())
- ->setRenderAsForm(true)
- ->setIcon('differential-dark')
- ->setIconSheet(PHUIIconView::SPRITE_APPS)
- ->setName(pht('View Revisions'))
- ->setHref($href);
-
- $event->setValue('actions', $actions);
- }
-
-}
-
diff --git a/src/applications/flag/events/PhabricatorFlagsUIEventListener.php b/src/applications/flag/events/PhabricatorFlagsUIEventListener.php
--- a/src/applications/flag/events/PhabricatorFlagsUIEventListener.php
+++ b/src/applications/flag/events/PhabricatorFlagsUIEventListener.php
@@ -31,6 +31,10 @@
return;
}
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
+ }
+
$flag = PhabricatorFlagQuery::loadUserFlag($user, $object->getPHID());
if ($flag) {
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -500,28 +500,6 @@
->setDisabled(!$can_edit)
->setWorkflow(true));
- $view->addAction(
- id(new PhabricatorActionView())
- ->setName(pht('Edit Differential Revisions'))
- ->setHref("/search/attach/{$phid}/DREV/")
- ->setWorkflow(true)
- ->setIcon('attach')
- ->setDisabled(!$can_edit)
- ->setWorkflow(true));
-
- $pholio_app =
- PhabricatorApplication::getByClass('PhabricatorApplicationPholio');
- if ($pholio_app->isInstalled()) {
- $view->addAction(
- id(new PhabricatorActionView())
- ->setName(pht('Edit Pholio Mocks'))
- ->setHref("/search/attach/{$phid}/MOCK/edge/")
- ->setWorkflow(true)
- ->setIcon('attach')
- ->setDisabled(!$can_edit)
- ->setWorkflow(true));
- }
-
return $view;
}
diff --git a/src/applications/maniphest/event/ManiphestActionMenuEventListener.php b/src/applications/maniphest/event/ManiphestActionMenuEventListener.php
--- a/src/applications/maniphest/event/ManiphestActionMenuEventListener.php
+++ b/src/applications/maniphest/event/ManiphestActionMenuEventListener.php
@@ -14,29 +14,58 @@
}
}
- private function handleActionsEvent($event) {
- $actions = $event->getValue('actions');
+ private function handleActionsEvent(PhutilEvent $event) {
+ $object = $event->getValue('object');
+
+ $actions = null;
+ if ($object instanceof PhabricatorUser) {
+ $actions = $this->renderUserItems($event);
+ } else if ($object instanceof PhabricatorProject) {
+ $actions = $this->renderProjectItems($event);
+ }
+
+ $this->addActionMenuItems($event, $actions);
+ }
+
+ private function renderUserItems(PhutilEvent $event) {
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
+ }
+
+ $user = $event->getValue('object');
+ $phid = $user->getPHID();
+ $view_uri = '/maniphest/?statuses[]=0&assigned='.$phid.'#R';
- $action = id(new PhabricatorActionView())
+ return id(new PhabricatorActionView())
->setIcon('maniphest-dark')
->setIconSheet(PHUIIconView::SPRITE_APPS)
- ->setName(pht('View Tasks'));
+ ->setName(pht('View Tasks'))
+ ->setHref($view_uri);
+ }
- $object = $event->getValue('object');
- if ($object instanceof PhabricatorUser) {
- $href = '/maniphest/?statuses[]=0&assigned='.$object->getPHID().'#R';
- $actions[] = $action->setHref($href);
- } else if ($object instanceof PhabricatorProject) {
- $href = '/maniphest/?statuses[]=0&allProjects[]='.$object->getPHID().'#R';
- $actions[] = $action->setHref($href);
+ private function renderProjectItems(PhutilEvent $event) {
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
+ }
- $actions[] = id(new PhabricatorActionView())
+ $project = $event->getValue('object');
+
+ $phid = $project->getPHID();
+ $view_uri = '/maniphest/?statuses[]=0&allProjects[]='.$phid.'#R';
+ $create_uri = '/maniphest/task/create/?projects='.$phid;
+
+ return array(
+ id(new PhabricatorActionView())
+ ->setIcon('maniphest-dark')
+ ->setIconSheet(PHUIIconView::SPRITE_APPS)
+ ->setName(pht('View Tasks'))
+ ->setHref($view_uri),
+ id(new PhabricatorActionView())
->setName(pht("Add Task"))
->setIcon('create')
- ->setHref('/maniphest/task/create/?projects=' . $object->getPHID());
- }
-
- $event->setValue('actions', $actions);
+ ->setHref($create_uri),
+ );
}
+
}
diff --git a/src/applications/pholio/application/PhabricatorApplicationPholio.php b/src/applications/pholio/application/PhabricatorApplicationPholio.php
--- a/src/applications/pholio/application/PhabricatorApplicationPholio.php
+++ b/src/applications/pholio/application/PhabricatorApplicationPholio.php
@@ -34,6 +34,12 @@
return true;
}
+ public function getEventListeners() {
+ return array(
+ new PholioActionMenuEventListener(),
+ );
+ }
+
public function getRemarkupRules() {
return array(
new PholioRemarkupRule(),
diff --git a/src/applications/pholio/event/PholioActionMenuEventListener.php b/src/applications/pholio/event/PholioActionMenuEventListener.php
new file mode 100644
--- /dev/null
+++ b/src/applications/pholio/event/PholioActionMenuEventListener.php
@@ -0,0 +1,52 @@
+<?php
+
+final class PholioActionMenuEventListener
+ extends PhabricatorEventListener {
+
+ public function register() {
+ $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS);
+ }
+
+ public function handleEvent(PhutilEvent $event) {
+ switch ($event->getType()) {
+ case PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS:
+ $this->handleActionsEvent($event);
+ break;
+ }
+ }
+
+ private function handleActionsEvent(PhutilEvent $event) {
+ $object = $event->getValue('object');
+
+ $actions = null;
+ if ($object instanceof ManiphestTask) {
+ $actions = $this->renderTaskItems($event);
+ }
+
+ $this->addActionMenuItems($event, $actions);
+ }
+
+ private function renderTaskItems(PhutilEvent $event) {
+ if (!$this->canUseApplication($event->getUser())) {
+ return;
+ }
+
+ $task = $event->getValue('object');
+ $phid = $task->getPHID();
+
+ $can_edit = PhabricatorPolicyFilter::hasCapability(
+ $event->getUser(),
+ $task,
+ PhabricatorPolicyCapability::CAN_EDIT);
+
+ return id(new PhabricatorActionView())
+ ->setName(pht('Edit Pholio Mocks'))
+ ->setHref("/search/attach/{$phid}/MOCK/edge/")
+ ->setWorkflow(true)
+ ->setIcon('attach')
+ ->setDisabled(!$can_edit)
+ ->setWorkflow(true);
+ }
+
+}
+
diff --git a/src/applications/phrequent/event/PhrequentUIEventListener.php b/src/applications/phrequent/event/PhrequentUIEventListener.php
--- a/src/applications/phrequent/event/PhrequentUIEventListener.php
+++ b/src/applications/phrequent/event/PhrequentUIEventListener.php
@@ -33,6 +33,10 @@
return;
}
+ if (!$this->canUseApplication($event->getUser())) {
+ return;
+ }
+
$tracking = PhrequentUserTimeQuery::isUserTrackingObject(
$user,
$object->getPHID());
@@ -56,9 +60,7 @@
$track_action->setDisabled(true);
}
- $actions = $event->getValue('actions');
- $actions[] = $track_action;
- $event->setValue('actions', $actions);
+ $this->addActionMenuItems($event, $track_action);
}
private function handlePropertyEvent($ui_event) {
@@ -75,6 +77,10 @@
return;
}
+ if (!$this->canUseApplication($ui_event->getUser())) {
+ return;
+ }
+
$events = id(new PhrequentUserTimeQuery())
->setViewer($user)
->withObjectPHIDs(array($object->getPHID()))
diff --git a/src/applications/phriction/event/PhrictionActionMenuEventListener.php b/src/applications/phriction/event/PhrictionActionMenuEventListener.php
--- a/src/applications/phriction/event/PhrictionActionMenuEventListener.php
+++ b/src/applications/phriction/event/PhrictionActionMenuEventListener.php
@@ -14,22 +14,31 @@
}
}
- private function handleActionsEvent($event) {
- $actions = $event->getValue('actions');
-
- $action = id(new PhabricatorActionView())
- ->setIcon('phriction-dark')
- ->setIconSheet(PHUIIconView::SPRITE_APPS)
- ->setName(pht('View Wiki'));
-
+ private function handleActionsEvent(PhutilEvent $event) {
$object = $event->getValue('object');
+
+ $actions = null;
if ($object instanceof PhabricatorProject) {
- $slug = PhabricatorSlug::normalize($object->getPhrictionSlug());
- $href = '/w/projects/'.$slug;
- $actions[] = $action->setHref($href);
+ $actions = $this->buildProjectActions($event);
+ }
+
+ $this->addActionMenuItems($event, $actions);
+ }
+
+ private function buildProjectActions(PhutilEvent $event) {
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
}
- $event->setValue('actions', $actions);
+ $project = $event->getValue('object');
+ $slug = PhabricatorSlug::normalize($project->getPhrictionSlug());
+ $href = '/w/projects/'.$slug;
+
+ return id(new PhabricatorActionView())
+ ->setIcon('phriction-dark')
+ ->setIconSheet(PHUIIconView::SPRITE_APPS)
+ ->setName(pht('View Wiki'))
+ ->setHref($href);
}
}
diff --git a/src/applications/tokens/event/PhabricatorTokenUIEventListener.php b/src/applications/tokens/event/PhabricatorTokenUIEventListener.php
--- a/src/applications/tokens/event/PhabricatorTokenUIEventListener.php
+++ b/src/applications/tokens/event/PhabricatorTokenUIEventListener.php
@@ -33,6 +33,10 @@
return;
}
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
+ }
+
$current = id(new PhabricatorTokenGivenQuery())
->setViewer($user)
->withAuthorPHIDs(array($user->getPHID()))
@@ -75,6 +79,10 @@
return;
}
+ if (!$this->canUseApplication($event->getUser())) {
+ return null;
+ }
+
$limit = 1;
$tokens_given = id(new PhabricatorTokenGivenQuery())
diff --git a/src/infrastructure/events/PhabricatorEventListener.php b/src/infrastructure/events/PhabricatorEventListener.php
--- a/src/infrastructure/events/PhabricatorEventListener.php
+++ b/src/infrastructure/events/PhabricatorEventListener.php
@@ -28,6 +28,26 @@
PhabricatorPolicyCapability::CAN_VIEW);
}
+ protected function addActionMenuItems(PhutilEvent $event, $items) {
+ if ($event->getType() !== PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS) {
+ throw new Exception("Not an action menu event!");
+ }
+
+ if (!$items) {
+ return;
+ }
+
+ if (!is_array($items)) {
+ $items = array($items);
+ }
+
+ $event_actions = $event->getValue('actions');
+ foreach ($items as $item) {
+ $event_actions[] = $item;
+ }
+ $event->setValue('actions', $event_actions);
+ }
+
}
diff --git a/src/view/layout/PhabricatorActionListView.php b/src/view/layout/PhabricatorActionListView.php
--- a/src/view/layout/PhabricatorActionListView.php
+++ b/src/view/layout/PhabricatorActionListView.php
@@ -42,7 +42,6 @@
PhutilEventEngine::dispatchEvent($event);
$actions = $event->getValue('actions');
-
if (!$actions) {
return null;
}

File Metadata

Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/kp/7v/gmqhh3h6wmv3cpsb
Default Alt Text
D7365.diff (20 KB)

Event Timeline

Phabricator · Built by Phacility