Skip to content

Commit

Permalink
Save layer setting in the region map UI (#12956) (#13166)
Browse files Browse the repository at this point in the history
Includes manual edits to resolve merge conflicts.
  • Loading branch information
thomasneirynck authored Jul 28, 2017
1 parent c87ba59 commit 0017b41
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/core_plugins/region_map/public/region_map_vis_params.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
id="regionMap"
class="kuiSelect kuiSideBarSelect"
ng-model="vis.params.selectedLayer"
ng-options="layer.name for layer in vis.type.params.vectorLayers"
ng-options="layer.name for layer in collections.vectorLayers track by layer.url"
ng-change="onLayerChange()"
ng-init="vis.params.selectedLayer=vis.type.params.vectorLayers[0]"
></select>
</div>
</div>
Expand All @@ -29,8 +28,7 @@
<div class="kuiSideBarFormRow__control">
<select id="joinField"
ng-model="vis.params.selectedJoinField"
ng-options="field.description for field in vis.params.selectedLayer.fields"
ng-init="vis.params.selectedJoinField=vis.params.selectedLayer.fields[0]"
ng-options="field.description for field in vis.params.selectedLayer.fields track by field.name"
>
<option value=''>Select</option></select>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ uiModules.get('kibana/region_map')
$scope.vis.params.selectedJoinField = $scope.vis.params.selectedLayer.fields[0];
}


}
};
});

0 comments on commit 0017b41

Please sign in to comment.