Page MenuHomePhabricator
Files F13179763

D12998.diff
No OneTemporary
Actions

D12998.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -333,7 +333,7 @@
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
'rsrc/js/application/calendar/behavior-day-view.js' => '5c46cff2',
'rsrc/js/application/calendar/behavior-event-all-day.js' => '38dcf3c8',
- 'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
+ 'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408',
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '10246726',
'rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js' => 'cf86d16a',
'rsrc/js/application/conpherence/behavior-durable-column.js' => '16c695bf',
@@ -543,7 +543,7 @@
'javelin-behavior-audio-source' => '59b251eb',
'javelin-behavior-audit-preview' => 'd835b03a',
'javelin-behavior-choose-control' => '6153c708',
- 'javelin-behavior-config-reorder-fields' => '14a827de',
+ 'javelin-behavior-config-reorder-fields' => 'b6993408',
'javelin-behavior-conpherence-drag-and-drop-photo' => 'cf86d16a',
'javelin-behavior-conpherence-menu' => 'c0348cac',
'javelin-behavior-conpherence-pontificate' => '21ba5861',
@@ -907,13 +907,6 @@
'javelin-dom',
'javelin-history',
),
- '14a827de' => array(
- 'javelin-behavior',
- 'javelin-stratcom',
- 'javelin-dom',
- 'javelin-json',
- 'phabricator-draggable-list',
- ),
'14ac66f5' => array(
'javelin-install',
'javelin-dom',
@@ -1728,6 +1721,13 @@
'javelin-dom',
'javelin-util',
),
+ 'b6993408' => array(
+ 'javelin-behavior',
+ 'javelin-stratcom',
+ 'javelin-dom',
+ 'javelin-json',
+ 'phabricator-draggable-list',
+ ),
'ba4fa35c' => array(
'javelin-behavior',
'javelin-dom',
diff --git a/src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php b/src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php
--- a/src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php
+++ b/src/infrastructure/customfield/config/PhabricatorCustomFieldConfigOptionType.php
@@ -12,9 +12,6 @@
$storage_value = $request->getStr('value');
$in_value = phutil_json_decode($storage_value);
- if (!is_array($in_value)) {
- $in_value = array();
- }
// When we submit from JS, we submit a list (since maps are not guaranteed
// to retain order). Convert it into a map for storage (since it's far more
@@ -113,7 +110,7 @@
'id' => $input_id,
'type' => 'hidden',
'name' => 'value',
- 'value' => json_encode($display_value),
+ 'value' => '',
));
Javelin::initBehavior(
diff --git a/webroot/rsrc/js/application/config/behavior-reorder-fields.js b/webroot/rsrc/js/application/config/behavior-reorder-fields.js
--- a/webroot/rsrc/js/application/config/behavior-reorder-fields.js
+++ b/webroot/rsrc/js/application/config/behavior-reorder-fields.js
@@ -54,4 +54,5 @@
JX.$(config.inputID).value = JX.JSON.stringify(order);
};
+ write_state_to_form();
});

File Metadata

Mime Type
text/plain
Expires
Thu, May 9, 9:25 PM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277932
Default Alt Text
D12998.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility