Page MenuHomePhabricator
Files F14024030

D11783.diff
No OneTemporary
Actions

D11783.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => '86353aff',
+ 'core.pkg.css' => 'f8f4b8dc',
'core.pkg.js' => '23d653bb',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '380f07e5',
@@ -124,9 +124,9 @@
'rsrc/css/phui/phui-action-list.css' => '9ee9910a',
'rsrc/css/phui/phui-action-panel.css' => '4bcb288d',
'rsrc/css/phui/phui-box.css' => '7b3a2eed',
- 'rsrc/css/phui/phui-button.css' => '008ba5e2',
+ 'rsrc/css/phui/phui-button.css' => 'ffe12633',
'rsrc/css/phui/phui-crumbs-view.css' => '594d719e',
- 'rsrc/css/phui/phui-document.css' => 'a494bdf8',
+ 'rsrc/css/phui/phui-document.css' => '8240b0b1',
'rsrc/css/phui/phui-error-view.css' => 'ad042fdd',
'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5',
'rsrc/css/phui/phui-fontkit.css' => '9ae12677',
@@ -773,13 +773,13 @@
'phui-action-header-view-css' => '89c497e7',
'phui-action-panel-css' => '4bcb288d',
'phui-box-css' => '7b3a2eed',
- 'phui-button-css' => '008ba5e2',
+ 'phui-button-css' => 'ffe12633',
'phui-calendar-css' => '8675968e',
'phui-calendar-day-css' => 'de035c8a',
'phui-calendar-list-css' => 'c1d0ca59',
'phui-calendar-month-css' => 'a92e47d2',
'phui-crumbs-view-css' => '594d719e',
- 'phui-document-view-css' => 'a494bdf8',
+ 'phui-document-view-css' => '8240b0b1',
'phui-error-view-css' => 'ad042fdd',
'phui-feed-story-css' => 'c9f3a0b5',
'phui-font-icon-base-css' => '3dad2ae3',
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
@@ -1955,6 +1955,7 @@
'PhabricatorMailingListsController' => 'applications/mailinglists/controller/PhabricatorMailingListsController.php',
'PhabricatorMailingListsEditController' => 'applications/mailinglists/controller/PhabricatorMailingListsEditController.php',
'PhabricatorMailingListsListController' => 'applications/mailinglists/controller/PhabricatorMailingListsListController.php',
+ 'PhabricatorMailingListsManageCapability' => 'applications/mailinglists/capability/PhabricatorMailingListsManageCapability.php',
'PhabricatorMainMenuSearchView' => 'view/page/menu/PhabricatorMainMenuSearchView.php',
'PhabricatorMainMenuView' => 'view/page/menu/PhabricatorMainMenuView.php',
'PhabricatorManagementWorkflow' => 'infrastructure/management/PhabricatorManagementWorkflow.php',
@@ -5228,6 +5229,7 @@
'PhabricatorMailingListsController' => 'PhabricatorController',
'PhabricatorMailingListsEditController' => 'PhabricatorMailingListsController',
'PhabricatorMailingListsListController' => 'PhabricatorMailingListsController',
+ 'PhabricatorMailingListsManageCapability' => 'PhabricatorPolicyCapability',
'PhabricatorMainMenuSearchView' => 'AphrontView',
'PhabricatorMainMenuView' => 'AphrontView',
'PhabricatorManagementWorkflow' => 'PhutilArgumentWorkflow',
diff --git a/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php b/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php
--- a/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php
+++ b/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php
@@ -37,4 +37,12 @@
return '@';
}
+ protected function getCustomCapabilities() {
+ return array(
+ PhabricatorMailingListsManageCapability::CAPABILITY => array(
+ 'default' => PhabricatorPolicies::POLICY_ADMIN,
+ ),
+ );
+ }
+
}
diff --git a/src/applications/mailinglists/capability/PhabricatorMailingListsManageCapability.php b/src/applications/mailinglists/capability/PhabricatorMailingListsManageCapability.php
new file mode 100644
--- /dev/null
+++ b/src/applications/mailinglists/capability/PhabricatorMailingListsManageCapability.php
@@ -0,0 +1,16 @@
+<?php
+
+final class PhabricatorMailingListsManageCapability
+ extends PhabricatorPolicyCapability {
+
+ const CAPABILITY = 'mailinglists.manage';
+
+ public function getCapabilityName() {
+ return pht('Can Manage Lists');
+ }
+
+ public function describeCapabilityRejection() {
+ return pht('You do not have permission to manage mailing lists.');
+ }
+
+}
diff --git a/src/applications/mailinglists/controller/PhabricatorMailingListsController.php b/src/applications/mailinglists/controller/PhabricatorMailingListsController.php
--- a/src/applications/mailinglists/controller/PhabricatorMailingListsController.php
+++ b/src/applications/mailinglists/controller/PhabricatorMailingListsController.php
@@ -28,11 +28,16 @@
protected function buildApplicationCrumbs() {
$crumbs = parent::buildApplicationCrumbs();
+ $can_manage = $this->hasApplicationCapability(
+ PhabricatorMailingListsManageCapability::CAPABILITY);
+
$crumbs->addAction(
id(new PHUIListItemView())
->setName(pht('Create List'))
->setHref($this->getApplicationURI('edit/'))
- ->setIcon('fa-plus-square'));
+ ->setIcon('fa-plus-square')
+ ->setDisabled(!$can_manage)
+ ->setWorkflow(!$can_manage));
return $crumbs;
}
diff --git a/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php b/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php
--- a/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php
+++ b/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php
@@ -3,21 +3,19 @@
final class PhabricatorMailingListsEditController
extends PhabricatorMailingListsController {
- private $id;
-
- public function willProcessRequest(array $data) {
- $this->id = idx($data, 'id');
- }
-
- public function processRequest() {
+ public function handleRequest(AphrontRequest $request) {
$request = $this->getRequest();
$viewer = $request->getUser();
- if ($this->id) {
+ $this->requireApplicationCapability(
+ PhabricatorMailingListsManageCapability::CAPABILITY);
+
+ $list_id = $request->getURIData('id');
+ if ($list_id) {
$page_title = pht('Edit Mailing List');
$list = id(new PhabricatorMailingListQuery())
->setViewer($viewer)
- ->withIDs(array($this->id))
+ ->withIDs(array($list_id))
->executeOne();
if (!$list) {
return new Aphront404Response();
diff --git a/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php b/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php
--- a/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php
+++ b/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php
@@ -64,6 +64,11 @@
$view = id(new PHUIObjectItemListView());
+ $can_manage = PhabricatorPolicyFilter::hasCapability(
+ $this->requireViewer(),
+ $this->getApplication(),
+ PhabricatorMailingListsManageCapability::CAPABILITY);
+
foreach ($lists as $list) {
$item = new PHUIObjectItemView();
@@ -73,7 +78,9 @@
$item->addAction(
id(new PHUIListItemView())
->setIcon('fa-pencil')
- ->setHref($this->getApplicationURI('/edit/'.$list->getID().'/')));
+ ->setHref($this->getApplicationURI('/edit/'.$list->getID().'/'))
+ ->setDisabled(!$can_manage)
+ ->setWorkflow(!$can_manage));
$view->addItem($item);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 8, 5:02 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6739072
Default Alt Text
D11783.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility