Page MenuHomePhabricator
Files F15456307

D20803.id.diff
No OneTemporary
Actions

D20803.id.diff
View Options

diff --git a/src/applications/policy/controller/PhabricatorPolicyExplainController.php b/src/applications/policy/controller/PhabricatorPolicyExplainController.php
--- a/src/applications/policy/controller/PhabricatorPolicyExplainController.php
+++ b/src/applications/policy/controller/PhabricatorPolicyExplainController.php
@@ -333,8 +333,8 @@
->appendList(
array(
PhabricatorPolicy::getPolicyExplanation(
- $viewer,
- $policy->getPHID()),
+ $viewer,
+ $policy->getPHID()),
));
$strength = $this->getStrengthInformation($object, $policy, $capability);
diff --git a/src/applications/policy/query/PhabricatorPolicyQuery.php b/src/applications/policy/query/PhabricatorPolicyQuery.php
--- a/src/applications/policy/query/PhabricatorPolicyQuery.php
+++ b/src/applications/policy/query/PhabricatorPolicyQuery.php
@@ -43,13 +43,12 @@
public static function renderPolicyDescriptions(
PhabricatorUser $viewer,
- PhabricatorPolicyInterface $object,
- $icon = false) {
+ PhabricatorPolicyInterface $object) {
$policies = self::loadPolicies($viewer, $object);
foreach ($policies as $capability => $policy) {
- $policies[$capability] = $policy->renderDescription($icon);
+ $policies[$capability] = $policy->renderDescription();
}
return $policies;
diff --git a/src/applications/policy/storage/PhabricatorPolicy.php b/src/applications/policy/storage/PhabricatorPolicy.php
--- a/src/applications/policy/storage/PhabricatorPolicy.php
+++ b/src/applications/policy/storage/PhabricatorPolicy.php
@@ -276,13 +276,7 @@
}
}
- public function renderDescription($icon = false) {
- $img = null;
- if ($icon) {
- $img = id(new PHUIIconView())
- ->setIcon($this->getIcon());
- }
-
+ public function renderDescription() {
if ($this->getHref()) {
$desc = javelin_tag(
'a',
@@ -291,16 +285,9 @@
'class' => 'policy-link',
'sigil' => $this->getWorkflow() ? 'workflow' : null,
),
- array(
- $img,
- $this->getName(),
- ));
+ $this->getName());
} else {
- if ($img) {
- $desc = array($img, $this->getName());
- } else {
- $desc = $this->getName();
- }
+ $desc = $this->getName();
}
switch ($this->getType()) {

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 31, 8:33 AM (1 d, 7 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7714727
Default Alt Text
D20803.id.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility