@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Always give users "fa-user" icons in tokenizers
Summary: Fixes T10247. The flavor icons are unhelpful/confusing in these contexts; show a boringer icon instead.
Test Plan: Used tokenizer to select user with custom profile icon. Reloaded page. Saw boringer icon in both cases.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T10247
Differential Revision: https://secure.phabricator.com/D15154
+19
-3
+4
-2
src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
+4
-2
src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
···
54
54
$icon_icon = PhabricatorPeopleIconSet::getIconIcon($icon_key);
55
55
$subtitle = $profile->getDisplayTitle();
56
56
57
-
$handle->setIcon($icon_icon);
58
-
$handle->setSubtitle($subtitle);
57
+
$handle
58
+
->setIcon($icon_icon)
59
+
->setSubtitle($subtitle)
60
+
->setTokenIcon('fa-user');
59
61
}
60
62
61
63
$availability = null;
+14
src/applications/phid/PhabricatorObjectHandle.php
+14
src/applications/phid/PhabricatorObjectHandle.php
···
28
28
private $objectName;
29
29
private $policyFiltered;
30
30
private $subtitle;
31
+
private $tokenIcon;
31
32
32
33
public function setIcon($icon) {
33
34
$this->icon = $icon;
···
84
85
return $this->tagColor;
85
86
}
86
87
return null;
88
+
}
89
+
90
+
public function setTokenIcon($icon) {
91
+
$this->tokenIcon = $icon;
92
+
return $this;
93
+
}
94
+
95
+
public function getTokenIcon() {
96
+
if ($this->tokenIcon !== null) {
97
+
return $this->tokenIcon;
98
+
}
99
+
100
+
return $this->getIcon();
87
101
}
88
102
89
103
public function getTypeIcon() {
+1
-1
src/applications/typeahead/view/PhabricatorTypeaheadTokenView.php
+1
-1
src/applications/typeahead/view/PhabricatorTypeaheadTokenView.php
···
32
32
$token = id(new PhabricatorTypeaheadTokenView())
33
33
->setKey($handle->getPHID())
34
34
->setValue($handle->getFullName())
35
-
->setIcon($handle->getIcon());
35
+
->setIcon($handle->getTokenIcon());
36
36
37
37
if ($handle->isDisabled() ||
38
38
$handle->getStatus() == PhabricatorObjectHandle::STATUS_CLOSED) {