1 files changed, 61 insertions, 12 deletions

diff --git a/bitbake/lib/toaster/toastergui/static/js/projectapp.js b/bitbake/lib/toaster/toastergui/static/js/projectapp.js
index a3309c76af..36c942fa29 100644
--- a/bitbake/lib/toaster/toastergui/static/js/projectapp.js
+++ b/bitbake/lib/toaster/toastergui/static/js/projectapp.js
@@ -156,6 +156,62 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
      * Retrieves text suggestions for text-edit drop down autocomplete boxes
      */
 
+    $scope.getLayersAutocompleteSuggestions = function(currentValue) {
+        var deffered = $q.defer();
+
+        $http({method:"GET", url: $scope.urls.layers, params : { search: currentValue, format: "json" }})
+            .success(function (_data) {
+                if (_data.error != "ok") {
+                    console.warn("error on data", _data.error);
+                    deffered.reject(_data.error);
+                }
+                deffered.resolve(_data.rows);
+            });
+
+        return deffered.promise;
+    }
+
+    $scope.filterProjectLayerIds = function () {
+        return $scope.layers.map(function (e) { return e.id; });
+    }
+
+    $scope.getMachinesAutocompleteSuggestions = function(currentValue) {
+        var deffered = $q.defer();
+
+        $http({method:"GET", url: $scope.urls.machines, params : { search: currentValue, format: "json" }})
+            .success(function (_data) {
+                if (_data.error != "ok") {
+                    console.warn("error on data", _data.error);
+                    deffered.reject(_data.error);
+                }
+                deffered.resolve(_data.rows);
+            });
+
+        return deffered.promise;
+    }
+
+    $scope.getRecipesAutocompleteSuggestions = function(currentValue) {
+        var deffered = $q.defer();
+
+        $http({method:"GET", url: $scope.urls.targets, params : { search: currentValue, format: "json" }})
+            .success(function (_data) {
+                if (_data.error != "ok") {
+                    console.warn("error on data", _data.error);
+                    deffered.reject(_data.error);
+                }
+                deffered.resolve(_data.rows);
+            });
+        return deffered.promise;
+    }
+
+    $scope.values = function() {
+        var deffered = $q.defer();
+
+        deffered.resolve(["mama", "tata"]);
+
+        return deffered.promise;
+    };
+
     $scope.getAutocompleteSuggestions = function(type, currentValue) {
         var deffered = $q.defer();
 
@@ -421,7 +477,7 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
 
 
     $scope.onLayerSelect = function (item) {
-        $scope.layerAddId = item.id;
+        $scope.layerToAdd = item;
     };
 
     $scope.machineSelect = function (machineName) {
@@ -443,14 +499,9 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
     };
 
 
-    $scope.layerAddById = function (id) {
-        $scope.layerAddId = id;
-        $scope.layerAdd();
-    };
-
     $scope.layerAdd = function() {
 
-        $http({method:"GET", url: $scope.urls.xhr_datatypeahead, params : { type: "layerdeps", value: $scope.layerAddId }})
+        $http({method:"GET", url: $scope.layerToAdd.layerdict.layerdetailurl, params : {}})
         .success(function (_data) {
              if (_data.error != "ok") {
                  console.warn(_data.error);
@@ -493,7 +544,7 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
                      });
 
                      modalInstance.result.then(function (selectedArray) {
-                         selectedArray.push($scope.layerAddId);
+                         selectedArray.push($scope.layerToAdd.layerversion.id);
                          console.warn("TRC6: selected", selectedArray);
 
                          $scope._makeXHRCall({
@@ -512,7 +563,7 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
                          $scope._makeXHRCall({
                              method: "POST", url: $scope.urls.xhr_edit,
                              data: {
-                                 layerAdd:  $scope.layerAddId,
+                                 layerAdd:  $scope.layerToAdd.layerversion.id,
                              }
                          }).then(function () {
                              $scope.layerAddName = undefined;
@@ -768,10 +819,8 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
 
 
         _cmdExecuteWithParam("/layeradd=", function (layer) {
-            angular.forEach(layer.split(","), function (l) {
-                $scope.layerAddId = l;
+                $scope.layerToAdd = layer;
                 $scope.layerAdd();
-            });
         });
     };