From: Alexandru DAMIAN <alexandru.damian@intel.com>
Date: Tue, 20 Jan 2015 16:56:35 +0000 (+0000)
Subject: toastegui: project page build selected targets
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8278d7b15b58484af93d952e594f29dabb9200a9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

toastegui: project page build selected targets

Fixing the action on the "Build selected targets" button.
Remove "build-button" duplicate id from the build page.

[YOCTO #7047]

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
---

diff --git a/lib/toaster/toastergui/static/js/projectapp.js b/lib/toaster/toastergui/static/js/projectapp.js
index 74471a1a514..bee3c56be2f 100644
--- a/lib/toaster/toastergui/static/js/projectapp.js
+++ b/lib/toaster/toastergui/static/js/projectapp.js
@@ -337,8 +337,12 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
     }
 
     $scope.buildExistingTarget = function(targets) {
+         $scope.buildTargetList(targets.map(function(v,i,a){return v.target}));
+    }
+
+    $scope.buildTargetList = function(targetlist) {
         var oldTargetName = $scope.targetName;
-        $scope.targetName = targets.map(function(v,i,a){return v.target}).join(' ');
+        $scope.targetName = targetlist.join(' ');
         $scope.buildNamedTarget();
         $scope.targetName = oldTargetName;
     }
@@ -733,12 +737,27 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
         angular.element(id+"-opposite").toggle();
     }
 
-    $scope.selectedMostBuildTargets = function () {
-        keys = Object.keys($scope.mostBuiltTargets);
+    /**
+     * Functionality related to "Most build targets"
+     */
+
+    $scope.enableBuildSelectedTargets = function () {
+        var keys = Object.keys($scope.mostBuiltTargets);
         keys = keys.filter(function (e) { if ($scope.mostBuiltTargets[e]) return e });
         return keys.length == 0;
     }
 
+    $scope.buildSelectedTargets = function () {
+        var keys = Object.keys($scope.mostBuiltTargets);
+        keys = keys.filter(function (e) { if ($scope.mostBuiltTargets[e]) return e });
+
+        $scope.buildTargetList(keys);
+        for (var i = 0; i < keys.length; i++)
+        {
+            $scope.mostBuiltTargets[keys[i]] = 0;
+        }
+    }
+
     /**
      * Helper function to deal with error string recognition and manipulation
      */
diff --git a/lib/toaster/toastergui/templates/project.html b/lib/toaster/toastergui/templates/project.html
index 815c24c4b50..fe3bcf29e00 100644
--- a/lib/toaster/toastergui/templates/project.html
+++ b/lib/toaster/toastergui/templates/project.html
@@ -92,7 +92,7 @@ vim: expandtab tabstop=2
     <form class="build-form" ng-submit="buildNamedTarget()">
       <div class="input-append controls">
         <input type="text" class="huge span7" placeholder="Type the target(s) you want to build" autocomplete="off" ng-model="targetName" typeahead="e.name for e in getAutocompleteSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length"/>
-        <button type="submit" id="build-button" class="btn btn-large btn-primary" ng-disabled="!targetName.length">
+        <button type="submit" class="btn btn-large btn-primary" ng-disabled="!targetName.length">
         Build
         </button>
       </div>
@@ -289,7 +289,7 @@ vim: expandtab tabstop=2
         <form ng-submit="buildNamedTarget()">
           <div class="input-append">
             <input type="text" class="input-xlarge" placeholder="Type the target(s) you want to build" autocomplete="off" data-minLength="1"  ng-model="targetName1" typeahead="e.name for e in getAutocompleteSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length">
-            <button type="submit" id="build-button" class="btn btn-primary" ng-disabled="!targetName1.length">
+            <button type="submit" class="btn btn-primary" ng-disabled="!targetName1.length">
               Build </button>
           </div>
           {% csrf_token %}
@@ -306,7 +306,7 @@ vim: expandtab tabstop=2
             </label>
           </li>
         </ul>
-        <button class="btn btn-large btn-primary" ng-disabled="selectedMostBuildTargets()">Build selected targets</button>
+        <button class="btn btn-large btn-primary" ng-disabled="enableBuildSelectedTargets()" ng-click="buildSelectedTargets()">Build selected targets</button>
         </div>
     </div>