1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-19 03:50:54 +01:00

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
This commit is contained in:
epriestley 2015-04-20 08:16:28 -07:00
parent 6c0b8b7d04
commit 2875f029be
2 changed files with 26 additions and 27 deletions

View file

@ -7,8 +7,8 @@
*/ */
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => '7d05ad2a', 'core.pkg.css' => 'bf29d341',
'core.pkg.js' => 'a626d14c', 'core.pkg.js' => 'dfea788f',
'darkconsole.pkg.js' => '8ab24e01', 'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '3500921f', 'differential.pkg.css' => '3500921f',
'differential.pkg.js' => 'c0506961', 'differential.pkg.js' => 'c0506961',
@ -27,7 +27,7 @@ return array(
'rsrc/css/aphront/panel-view.css' => '8427b78d', 'rsrc/css/aphront/panel-view.css' => '8427b78d',
'rsrc/css/aphront/phabricator-nav-view.css' => '7aeaf435', 'rsrc/css/aphront/phabricator-nav-view.css' => '7aeaf435',
'rsrc/css/aphront/table-view.css' => '59e2c0f8', 'rsrc/css/aphront/table-view.css' => '59e2c0f8',
'rsrc/css/aphront/tokenizer.css' => '86a13f7f', 'rsrc/css/aphront/tokenizer.css' => 'c10c061e',
'rsrc/css/aphront/tooltip.css' => '7672b60f', 'rsrc/css/aphront/tooltip.css' => '7672b60f',
'rsrc/css/aphront/two-column.css' => '16ab3ad2', 'rsrc/css/aphront/two-column.css' => '16ab3ad2',
'rsrc/css/aphront/typeahead-browse.css' => 'efe293a0', 'rsrc/css/aphront/typeahead-browse.css' => 'efe293a0',
@ -147,7 +147,7 @@ return array(
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
'rsrc/css/phui/phui-spacing.css' => '042804d6', 'rsrc/css/phui/phui-spacing.css' => '042804d6',
'rsrc/css/phui/phui-status.css' => '888cedb8', 'rsrc/css/phui/phui-status.css' => '888cedb8',
'rsrc/css/phui/phui-tag-view.css' => '402691cc', 'rsrc/css/phui/phui-tag-view.css' => 'ea469f3a',
'rsrc/css/phui/phui-text.css' => 'cf019f54', 'rsrc/css/phui/phui-text.css' => 'cf019f54',
'rsrc/css/phui/phui-timeline-view.css' => 'b0fbc4d7', 'rsrc/css/phui/phui-timeline-view.css' => 'b0fbc4d7',
'rsrc/css/phui/phui-workboard-view.css' => '3279cbbf', 'rsrc/css/phui/phui-workboard-view.css' => '3279cbbf',
@ -450,7 +450,7 @@ return array(
'rsrc/js/core/KeyboardShortcutManager.js' => 'c1700f6f', 'rsrc/js/core/KeyboardShortcutManager.js' => 'c1700f6f',
'rsrc/js/core/MultirowRowManager.js' => 'b5d57730', 'rsrc/js/core/MultirowRowManager.js' => 'b5d57730',
'rsrc/js/core/Notification.js' => '0c6946e7', 'rsrc/js/core/Notification.js' => '0c6946e7',
'rsrc/js/core/Prefab.js' => 'b972bdcd', 'rsrc/js/core/Prefab.js' => '6920d200',
'rsrc/js/core/ShapedRequest.js' => '7cbe244b', 'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
'rsrc/js/core/TextAreaUtils.js' => '5c93c52c', 'rsrc/js/core/TextAreaUtils.js' => '5c93c52c',
'rsrc/js/core/Title.js' => 'df5e11d2', 'rsrc/js/core/Title.js' => 'df5e11d2',
@ -510,7 +510,7 @@ return array(
'aphront-pager-view-css' => '2e3539af', 'aphront-pager-view-css' => '2e3539af',
'aphront-panel-view-css' => '8427b78d', 'aphront-panel-view-css' => '8427b78d',
'aphront-table-view-css' => '59e2c0f8', 'aphront-table-view-css' => '59e2c0f8',
'aphront-tokenizer-control-css' => '86a13f7f', 'aphront-tokenizer-control-css' => 'c10c061e',
'aphront-tooltip-css' => '7672b60f', 'aphront-tooltip-css' => '7672b60f',
'aphront-two-column-view-css' => '16ab3ad2', 'aphront-two-column-view-css' => '16ab3ad2',
'aphront-typeahead-control-css' => '0e403212', 'aphront-typeahead-control-css' => '0e403212',
@ -744,7 +744,7 @@ return array(
'phabricator-notification-menu-css' => '3c9d8aa1', 'phabricator-notification-menu-css' => '3c9d8aa1',
'phabricator-object-selector-css' => '029a133d', 'phabricator-object-selector-css' => '029a133d',
'phabricator-phtize' => 'd254d646', 'phabricator-phtize' => 'd254d646',
'phabricator-prefab' => 'b972bdcd', 'phabricator-prefab' => '6920d200',
'phabricator-profile-css' => '1a20dcbf', 'phabricator-profile-css' => '1a20dcbf',
'phabricator-remarkup-css' => 'e10512ff', 'phabricator-remarkup-css' => 'e10512ff',
'phabricator-search-results-css' => '15c71110', 'phabricator-search-results-css' => '15c71110',
@ -806,7 +806,7 @@ return array(
'phui-remarkup-preview-css' => '19ad512b', 'phui-remarkup-preview-css' => '19ad512b',
'phui-spacing-css' => '042804d6', 'phui-spacing-css' => '042804d6',
'phui-status-list-view-css' => '888cedb8', 'phui-status-list-view-css' => '888cedb8',
'phui-tag-view-css' => '402691cc', 'phui-tag-view-css' => 'ea469f3a',
'phui-text-css' => 'cf019f54', 'phui-text-css' => 'cf019f54',
'phui-timeline-view-css' => 'b0fbc4d7', 'phui-timeline-view-css' => 'b0fbc4d7',
'phui-workboard-view-css' => '3279cbbf', 'phui-workboard-view-css' => '3279cbbf',
@ -1296,6 +1296,18 @@ return array(
'6882e80a' => array( '6882e80a' => array(
'javelin-dom', 'javelin-dom',
), ),
'6920d200' => array(
'javelin-install',
'javelin-util',
'javelin-dom',
'javelin-typeahead',
'javelin-tokenizer',
'javelin-typeahead-preloaded-source',
'javelin-typeahead-ondemand-source',
'javelin-dom',
'javelin-stratcom',
'javelin-util',
),
'69adf288' => array( '69adf288' => array(
'javelin-install', 'javelin-install',
), ),
@ -1469,10 +1481,6 @@ return array(
'phabricator-tooltip', 'phabricator-tooltip',
'changeset-view-manager', 'changeset-view-manager',
), ),
'86a13f7f' => array(
'aphront-typeahead-control-css',
'phui-tag-view-css',
),
'87cb6b51' => array( '87cb6b51' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-dom', 'javelin-dom',
@ -1711,18 +1719,6 @@ return array(
'javelin-dom', 'javelin-dom',
'javelin-util', 'javelin-util',
), ),
'b972bdcd' => array(
'javelin-install',
'javelin-util',
'javelin-dom',
'javelin-typeahead',
'javelin-tokenizer',
'javelin-typeahead-preloaded-source',
'javelin-typeahead-ondemand-source',
'javelin-dom',
'javelin-stratcom',
'javelin-util',
),
'bba9eedf' => array( 'bba9eedf' => array(
'javelin-behavior', 'javelin-behavior',
'javelin-stratcom', 'javelin-stratcom',
@ -1768,6 +1764,9 @@ return array(
'javelin-util', 'javelin-util',
'phabricator-shaped-request', 'phabricator-shaped-request',
), ),
'c10c061e' => array(
'aphront-typeahead-control-css',
),
'c1700f6f' => array( 'c1700f6f' => array(
'javelin-install', 'javelin-install',
'javelin-util', 'javelin-util',

View file

@ -184,9 +184,9 @@ JX.install('Prefab', {
type = result.tokenType; type = result.tokenType;
color = result.color; color = result.color;
} else { } else {
icon = config.icons[key]; icon = (config.icons || {})[key];
type = config.types[key]; type = (config.types || {})[key];
color = config.colors[key]; color = (config.colors || {})[key];
} }
if (icon) { if (icon) {