Post-rebase fixes.

drag_and_drop_v2/public/js/drag_and_drop.js

@@ -167,15 +167,10 @@ function DragNDropTemplates(url_name) {
         var items_in_zone = [];
         if (zone.align !== 'none') {
             item_wrapper += '.item-align.item-align-' + zone.align;
-            var is_item_in_zone = function(i) { return i.is_placed && (i.zone === zone.title); };
+            var is_item_in_zone = function(i) { return i.is_placed && (i.zone === zone.uid); };
             items_in_zone = $.grep(ctx.items, is_item_in_zone);
         }
 
-        // Render the items in the zone
-        var is_item_in_zone = function(i) { return i.zone === zone.uid; };
-        var items_in_zone = $.grep(ctx.items, is_item_in_zone);
-        ctx.item_zone = zone;
-
         return (
             h(
                 selector,
@@ -1008,7 +1003,7 @@ function DragAndDropBlock(runtime, element, configuration) {
         var zone_alignments = {};
         configuration.zones.forEach(function(zone) {
             if (!zone.align) zone.align = 'none';
-            zone_alignments[zone.title] = zone.align;
+            zone_alignments[zone.uid] = zone.align;
         });
         Object.keys(state.items).forEach(function(item_id) {
             var item = state.items[item_id];

tests/integration/test_render.py

@@ -181,7 +181,7 @@ class TestDragAndDropRender(BaseIntegrationTest):
             self.assertEqual(zone.get_attribute('dropzone'), 'move')
             self.assertEqual(zone.get_attribute('aria-dropeffect'), 'move')
             self.assertEqual(zone.get_attribute('data-uid'), 'Zone {}'.format(zone_number))
-            self.assertEqual(zone.get_attribute('data-zone_align'), '')
+            self.assertEqual(zone.get_attribute('data-zone_align'), 'none')
             self.assertIn('ui-droppable', self.get_element_classes(zone))
             zone_box_percentages = box_percentages[index]
             self._assert_box_percentages(  # pylint: disable=star-args