@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
Highlight disabled users in Remarkup
Test Plan:
@btrahan
@epriestley
@xxx
Reviewers: epriestley
Reviewed By: epriestley
CC: aran, Koolvin
Differential Revision: https://secure.phabricator.com/D2374
+41
-30
+26
-26
src/__celerity_resource_map__.php
+26
-26
src/__celerity_resource_map__.php
···
2158
2158
),
2159
2159
'phabricator-remarkup-css' =>
2160
2160
array(
2161
-
'uri' => '/res/3add9f99/rsrc/css/core/remarkup.css',
2161
+
'uri' => '/res/f6d48479/rsrc/css/core/remarkup.css',
2162
2162
'type' => 'css',
2163
2163
'requires' =>
2164
2164
array(
···
2452
2452
), array(
2453
2453
'packages' =>
2454
2454
array(
2455
-
'9c4e265b' =>
2455
+
'2b054c5c' =>
2456
2456
array(
2457
2457
'name' => 'core.pkg.css',
2458
2458
'symbols' =>
···
2481
2481
21 => 'phabricator-flag-css',
2482
2482
22 => 'aphront-error-view-css',
2483
2483
),
2484
-
'uri' => '/res/pkg/9c4e265b/core.pkg.css',
2484
+
'uri' => '/res/pkg/2b054c5c/core.pkg.css',
2485
2485
'type' => 'css',
2486
2486
),
2487
2487
'0c96375e' =>
···
2648
2648
'reverse' =>
2649
2649
array(
2650
2650
'aphront-attached-file-view-css' => '7839ae2d',
2651
-
'aphront-crumbs-view-css' => '9c4e265b',
2652
-
'aphront-dialog-view-css' => '9c4e265b',
2653
-
'aphront-error-view-css' => '9c4e265b',
2654
-
'aphront-form-view-css' => '9c4e265b',
2651
+
'aphront-crumbs-view-css' => '2b054c5c',
2652
+
'aphront-dialog-view-css' => '2b054c5c',
2653
+
'aphront-error-view-css' => '2b054c5c',
2654
+
'aphront-form-view-css' => '2b054c5c',
2655
2655
'aphront-headsup-action-list-view-css' => '59d298c3',
2656
-
'aphront-headsup-view-css' => '9c4e265b',
2657
-
'aphront-list-filter-view-css' => '9c4e265b',
2658
-
'aphront-pager-view-css' => '9c4e265b',
2659
-
'aphront-panel-view-css' => '9c4e265b',
2660
-
'aphront-side-nav-view-css' => '9c4e265b',
2661
-
'aphront-table-view-css' => '9c4e265b',
2662
-
'aphront-tokenizer-control-css' => '9c4e265b',
2663
-
'aphront-tooltip-css' => '9c4e265b',
2664
-
'aphront-typeahead-control-css' => '9c4e265b',
2656
+
'aphront-headsup-view-css' => '2b054c5c',
2657
+
'aphront-list-filter-view-css' => '2b054c5c',
2658
+
'aphront-pager-view-css' => '2b054c5c',
2659
+
'aphront-panel-view-css' => '2b054c5c',
2660
+
'aphront-side-nav-view-css' => '2b054c5c',
2661
+
'aphront-table-view-css' => '2b054c5c',
2662
+
'aphront-tokenizer-control-css' => '2b054c5c',
2663
+
'aphront-tooltip-css' => '2b054c5c',
2664
+
'aphront-typeahead-control-css' => '2b054c5c',
2665
2665
'differential-changeset-view-css' => '59d298c3',
2666
2666
'differential-core-view-css' => '59d298c3',
2667
2667
'differential-inline-comment-editor' => '5b7b36d7',
···
2727
2727
'javelin-workflow' => '0c96375e',
2728
2728
'maniphest-task-summary-css' => '7839ae2d',
2729
2729
'maniphest-transaction-detail-css' => '7839ae2d',
2730
-
'phabricator-app-buttons-css' => '9c4e265b',
2730
+
'phabricator-app-buttons-css' => '2b054c5c',
2731
2731
'phabricator-content-source-view-css' => '59d298c3',
2732
-
'phabricator-core-buttons-css' => '9c4e265b',
2733
-
'phabricator-core-css' => '9c4e265b',
2734
-
'phabricator-directory-css' => '9c4e265b',
2732
+
'phabricator-core-buttons-css' => '2b054c5c',
2733
+
'phabricator-core-css' => '2b054c5c',
2734
+
'phabricator-directory-css' => '2b054c5c',
2735
2735
'phabricator-drag-and-drop-file-upload' => '5b7b36d7',
2736
2736
'phabricator-dropdown-menu' => '0c96375e',
2737
-
'phabricator-flag-css' => '9c4e265b',
2738
-
'phabricator-jump-nav' => '9c4e265b',
2737
+
'phabricator-flag-css' => '2b054c5c',
2738
+
'phabricator-jump-nav' => '2b054c5c',
2739
2739
'phabricator-keyboard-shortcut' => '0c96375e',
2740
2740
'phabricator-keyboard-shortcut-manager' => '0c96375e',
2741
2741
'phabricator-menu-item' => '0c96375e',
···
2743
2743
'phabricator-paste-file-upload' => '0c96375e',
2744
2744
'phabricator-prefab' => '0c96375e',
2745
2745
'phabricator-project-tag-css' => '7839ae2d',
2746
-
'phabricator-remarkup-css' => '9c4e265b',
2746
+
'phabricator-remarkup-css' => '2b054c5c',
2747
2747
'phabricator-shaped-request' => '5b7b36d7',
2748
-
'phabricator-standard-page-view' => '9c4e265b',
2748
+
'phabricator-standard-page-view' => '2b054c5c',
2749
2749
'phabricator-tooltip' => '0c96375e',
2750
-
'phabricator-transaction-view-css' => '9c4e265b',
2751
-
'syntax-highlighting-css' => '9c4e265b',
2750
+
'phabricator-transaction-view-css' => '2b054c5c',
2751
+
'syntax-highlighting-css' => '2b054c5c',
2752
2752
),
2753
2753
));
+10
-4
src/infrastructure/markup/remarkup/markuprule/mention/PhabricatorRemarkupRuleMention.php
+10
-4
src/infrastructure/markup/remarkup/markuprule/mention/PhabricatorRemarkupRuleMention.php
···
82
82
$user_table = new PhabricatorUser();
83
83
$real_user_names = queryfx_all(
84
84
$user_table->establishConnection('r'),
85
-
'SELECT username, phid, realName FROM %T WHERE username IN (%Ls)',
85
+
'SELECT username, phid, realName, isDisabled
86
+
FROM %T
87
+
WHERE username IN (%Ls)',
86
88
$user_table->getTableName(),
87
89
$usernames);
88
90
···
99
101
100
102
foreach ($metadata as $username => $tokens) {
101
103
$exists = isset($actual_users[$username]);
102
-
$class = $exists
103
-
? 'phabricator-remarkup-mention-exists'
104
-
: 'phabricator-remarkup-mention-unknown';
104
+
if (!$exists) {
105
+
$class = 'phabricator-remarkup-mention-unknown';
106
+
} else if ($actual_users[$username]['isDisabled']) {
107
+
$class = 'phabricator-remarkup-mention-disabled';
108
+
} else {
109
+
$class = 'phabricator-remarkup-mention-exists';
110
+
}
105
111
106
112
if ($exists) {
107
113
$tag = phutil_render_tag(
+5
webroot/rsrc/css/core/remarkup.css
+5
webroot/rsrc/css/core/remarkup.css