From d06d1ada28a68e9286999ad4cd4366e4da3ac710 Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Sun, 28 Feb 2016 18:54:20 +0200
Subject: [PATCH] Fix: data source loaded without properties

---
 rd_ui/app/scripts/directives/data_source_directives.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rd_ui/app/scripts/directives/data_source_directives.js b/rd_ui/app/scripts/directives/data_source_directives.js
index 784f6fdf1..ebc8a35e3 100644
--- a/rd_ui/app/scripts/directives/data_source_directives.js
+++ b/rd_ui/app/scripts/directives/data_source_directives.js
@@ -4,7 +4,7 @@
   var directives = angular.module('redash.directives');
 
   // Angular strips data- from the directive, so data-source-form becomes sourceForm...
-  directives.directive('sourceForm', ['$http', 'growl', function ($http, growl) {
+  directives.directive('sourceForm', ['$http', 'growl', '$q', function ($http, growl, $q) {
     return {
       restrict: 'E',
       replace: true,
@@ -34,7 +34,10 @@
           });
         });
 
-        $http.get('api/data_sources/types').success(function (types) {
+        var typesPromise = $http.get('api/data_sources/types');
+
+        $q.all([typesPromise, $scope.dataSource.$promise]).then(function(responses) {
+          var types = responses[0].data;
           setType(types);
 
           $scope.dataSourceTypes = types;