@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
Fix an issue with custom policy edit control not populating correctly
Summary: These values aren't always provided. They should be, but just make things work for now.
Test Plan:
- Edited a task.
- Selected "Custom Policy" for "Edit Policy".
- Configured a policy like "Users: dog".
- Saved policy.
- Selected "Custom Policy" again to edit the policy.
- Before patch: tokenizer fails to render with an error (`config.types` is not an object).
- After patch: tokenizer renders properly, albeit with a missing icon.
Reviewers: btrahan, chad
Reviewed By: chad
Subscribers: epriestley
Differential Revision: https://secure.phabricator.com/D12477
+26
-27
+23
-24
resources/celerity/map.php
+23
-24
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => '7d05ad2a',
11
-
'core.pkg.js' => 'a626d14c',
10
+
'core.pkg.css' => 'bf29d341',
11
+
'core.pkg.js' => 'dfea788f',
12
12
'darkconsole.pkg.js' => '8ab24e01',
13
13
'differential.pkg.css' => '3500921f',
14
14
'differential.pkg.js' => 'c0506961',
···
27
27
'rsrc/css/aphront/panel-view.css' => '8427b78d',
28
28
'rsrc/css/aphront/phabricator-nav-view.css' => '7aeaf435',
29
29
'rsrc/css/aphront/table-view.css' => '59e2c0f8',
30
-
'rsrc/css/aphront/tokenizer.css' => '86a13f7f',
30
+
'rsrc/css/aphront/tokenizer.css' => 'c10c061e',
31
31
'rsrc/css/aphront/tooltip.css' => '7672b60f',
32
32
'rsrc/css/aphront/two-column.css' => '16ab3ad2',
33
33
'rsrc/css/aphront/typeahead-browse.css' => 'efe293a0',
···
147
147
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
148
148
'rsrc/css/phui/phui-spacing.css' => '042804d6',
149
149
'rsrc/css/phui/phui-status.css' => '888cedb8',
150
-
'rsrc/css/phui/phui-tag-view.css' => '402691cc',
150
+
'rsrc/css/phui/phui-tag-view.css' => 'ea469f3a',
151
151
'rsrc/css/phui/phui-text.css' => 'cf019f54',
152
152
'rsrc/css/phui/phui-timeline-view.css' => 'b0fbc4d7',
153
153
'rsrc/css/phui/phui-workboard-view.css' => '3279cbbf',
···
450
450
'rsrc/js/core/KeyboardShortcutManager.js' => 'c1700f6f',
451
451
'rsrc/js/core/MultirowRowManager.js' => 'b5d57730',
452
452
'rsrc/js/core/Notification.js' => '0c6946e7',
453
-
'rsrc/js/core/Prefab.js' => 'b972bdcd',
453
+
'rsrc/js/core/Prefab.js' => '6920d200',
454
454
'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
455
455
'rsrc/js/core/TextAreaUtils.js' => '5c93c52c',
456
456
'rsrc/js/core/Title.js' => 'df5e11d2',
···
510
510
'aphront-pager-view-css' => '2e3539af',
511
511
'aphront-panel-view-css' => '8427b78d',
512
512
'aphront-table-view-css' => '59e2c0f8',
513
-
'aphront-tokenizer-control-css' => '86a13f7f',
513
+
'aphront-tokenizer-control-css' => 'c10c061e',
514
514
'aphront-tooltip-css' => '7672b60f',
515
515
'aphront-two-column-view-css' => '16ab3ad2',
516
516
'aphront-typeahead-control-css' => '0e403212',
···
744
744
'phabricator-notification-menu-css' => '3c9d8aa1',
745
745
'phabricator-object-selector-css' => '029a133d',
746
746
'phabricator-phtize' => 'd254d646',
747
-
'phabricator-prefab' => 'b972bdcd',
747
+
'phabricator-prefab' => '6920d200',
748
748
'phabricator-profile-css' => '1a20dcbf',
749
749
'phabricator-remarkup-css' => 'e10512ff',
750
750
'phabricator-search-results-css' => '15c71110',
···
806
806
'phui-remarkup-preview-css' => '19ad512b',
807
807
'phui-spacing-css' => '042804d6',
808
808
'phui-status-list-view-css' => '888cedb8',
809
-
'phui-tag-view-css' => '402691cc',
809
+
'phui-tag-view-css' => 'ea469f3a',
810
810
'phui-text-css' => 'cf019f54',
811
811
'phui-timeline-view-css' => 'b0fbc4d7',
812
812
'phui-workboard-view-css' => '3279cbbf',
···
1296
1296
'6882e80a' => array(
1297
1297
'javelin-dom',
1298
1298
),
1299
+
'6920d200' => array(
1300
+
'javelin-install',
1301
+
'javelin-util',
1302
+
'javelin-dom',
1303
+
'javelin-typeahead',
1304
+
'javelin-tokenizer',
1305
+
'javelin-typeahead-preloaded-source',
1306
+
'javelin-typeahead-ondemand-source',
1307
+
'javelin-dom',
1308
+
'javelin-stratcom',
1309
+
'javelin-util',
1310
+
),
1299
1311
'69adf288' => array(
1300
1312
'javelin-install',
1301
1313
),
···
1468
1480
'javelin-stratcom',
1469
1481
'phabricator-tooltip',
1470
1482
'changeset-view-manager',
1471
-
),
1472
-
'86a13f7f' => array(
1473
-
'aphront-typeahead-control-css',
1474
-
'phui-tag-view-css',
1475
1483
),
1476
1484
'87cb6b51' => array(
1477
1485
'javelin-behavior',
···
1711
1719
'javelin-dom',
1712
1720
'javelin-util',
1713
1721
),
1714
-
'b972bdcd' => array(
1715
-
'javelin-install',
1716
-
'javelin-util',
1717
-
'javelin-dom',
1718
-
'javelin-typeahead',
1719
-
'javelin-tokenizer',
1720
-
'javelin-typeahead-preloaded-source',
1721
-
'javelin-typeahead-ondemand-source',
1722
-
'javelin-dom',
1723
-
'javelin-stratcom',
1724
-
'javelin-util',
1725
-
),
1726
1722
'bba9eedf' => array(
1727
1723
'javelin-behavior',
1728
1724
'javelin-stratcom',
···
1767
1763
'javelin-dom',
1768
1764
'javelin-util',
1769
1765
'phabricator-shaped-request',
1766
+
),
1767
+
'c10c061e' => array(
1768
+
'aphront-typeahead-control-css',
1770
1769
),
1771
1770
'c1700f6f' => array(
1772
1771
'javelin-install',
+3
-3
webroot/rsrc/js/core/Prefab.js
+3
-3
webroot/rsrc/js/core/Prefab.js
···
184
184
type = result.tokenType;
185
185
color = result.color;
186
186
} else {
187
-
icon = config.icons[key];
188
-
type = config.types[key];
189
-
color = config.colors[key];
187
+
icon = (config.icons || {})[key];
188
+
type = (config.types || {})[key];
189
+
color = (config.colors || {})[key];
190
190
}
191
191
192
192
if (icon) {