Commit 8f4a89d7 authored by webchick's avatar webchick

Issue #2281697 by benjy, Ryan Weal, oadaeh: Fixed Field weights are not migrated.

parent 8d184707
......@@ -45,7 +45,7 @@ public function query() {
));
$query->join('content_node_field', 'cnf', 'cnf.field_name = cnfi.field_name');
$query->orderBy('type_name');
$query->orderBy('weight');
return $query;
}
......
......@@ -36,7 +36,7 @@ protected function runQuery() {
$rows[$index]['field_name'] = $field_name;
$rows[$index]['type'] = $field_row['type'];
$rows[$index]['module'] = $field_row['module'];
$rows[$index]['weight'] = $field_row['display_settings']['weight'];
$rows[$index]['weight'] = $field_row['weight'];
$rows[$index]['widget_type'] = $field_row['widget_type'];
$rows[$index]['widget_settings'] = $field_row['widget_settings'];
}
......@@ -66,7 +66,7 @@ public function query() {
'module',
));
$query->join('content_node_field', 'cnf', 'cnfi.field_name = cnf.field_name');
$query->orderBy('type_name');
$query->orderBy('weight');
return $query;
}
......
......@@ -39,7 +39,7 @@ protected function runQuery() {
$rows[$index]['field_name'] = $field_name;
$rows[$index]['type'] = $field_row['type'];
$rows[$index]['module'] = $field_row['module'];
$rows[$index]['weight'] = $field_row['display_settings']['weight'];
$rows[$index]['weight'] = $field_row['weight'];
$rows[$index]['label'] = $field_row['display_settings']['label']['format'];
$rows[$index]['display_settings'] = $field_row['display_settings'][$view_mode];
$rows[$index]['widget_settings'] = $field_row['widget_settings'];
......@@ -68,7 +68,7 @@ public function query() {
'module',
));
$query->join('content_node_field', 'cnf', 'cnfi.field_name = cnf.field_name');
$query->orderBy('type_name');
$query->orderBy('weight');
return $query;
}
......
......@@ -61,7 +61,7 @@ class FieldInstancePerViewModeTest extends MigrateSqlSourceTestCase {
'field_name' => 'field_test',
'type' => 'text',
'module' => 'text',
'weight' => 1,
'weight' => 2,
'label' => 'above',
'display_settings' => array(
'weight' => 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment