Page MenuHomePhabricator
Files F14609554

D14868.id35945.diff
No OneTemporary
Actions

D14868.id35945.diff
View Options

diff --git a/src/applications/policy/rule/PhabricatorPolicyRule.php b/src/applications/policy/rule/PhabricatorPolicyRule.php
--- a/src/applications/policy/rule/PhabricatorPolicyRule.php
+++ b/src/applications/policy/rule/PhabricatorPolicyRule.php
@@ -11,10 +11,6 @@
const CONTROL_TYPE_NONE = 'none';
abstract public function getRuleDescription();
- abstract public function applyRule(
- PhabricatorUser $viewer,
- $value,
- PhabricatorPolicyInterface $object);
public function willApplyRules(
PhabricatorUser $viewer,
@@ -23,6 +19,11 @@
return;
}
+ abstract public function applyRule(
+ PhabricatorUser $viewer,
+ $value,
+ PhabricatorPolicyInterface $object);
+
public function getValueControlType() {
return self::CONTROL_TYPE_TEXT;
}
@@ -35,7 +36,7 @@
* Return `true` if this rule can be applied to the given object.
*
* Some policy rules may only operation on certain kinds of objects. For
- * example, a "task author" rule
+ * example, a "task author" rule can only operate on tasks.
*/
public function canApplyToObject(PhabricatorPolicyInterface $object) {
return true;
@@ -43,6 +44,7 @@
protected function getDatasourceTemplate(
PhabricatorTypeaheadDatasource $datasource) {
+
return array(
'markup' => new AphrontTokenizerTemplateView(),
'uri' => $datasource->getDatasourceURI(),
@@ -65,6 +67,7 @@
public function getRequiredHandlePHIDsForSummary($value) {
$phids = array();
+
switch ($this->getValueControlType()) {
case self::CONTROL_TYPE_TOKENIZER:
$phids = $value;
@@ -86,7 +89,7 @@
}
/**
- * Return true if the given value creates a rule with a meaningful effect.
+ * Return `true` if the given value creates a rule with a meaningful effect.
* An example of a rule with no meaningful effect is a "users" rule with no
* users specified.
*
@@ -131,7 +134,7 @@
$cache->setKey(self::getObjectPolicyCacheKey($object, $rule), $hint);
}
- protected function getTransactionHint(
+ final protected function getTransactionHint(
PhabricatorPolicyInterface $object) {
$cache = PhabricatorCaches::getRequestCache();
@@ -164,7 +167,7 @@
return null;
}
- public function getObjectPolicyFullKey() {
+ final public function getObjectPolicyFullKey() {
$key = $this->getObjectPolicyKey();
if (!$key) {
diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -91,7 +91,8 @@
->setName(pht('Edit Details'))
->setIcon('fa-pencil')
->setHref($this->getApplicationURI("details/{$id}/"))
- ->setDisabled(!$can_edit));
+ ->setDisabled(!$can_edit)
+ ->setWorkflow(!$can_edit));
$view->addAction(
id(new PhabricatorActionView())

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 10, 9:52 AM (13 h, 43 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6982396
Default Alt Text
D14868.id35945.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility