diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-01-20 16:56:35 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:33:53 +0000 |
commit | 08e5a49afbc4c2b777be61785ecd7854837d6250 (patch) | |
tree | dd32b59fff8fb118ad059e9be83f15d9d8edf744 | |
parent | c546815eeea92ebda4fe4120a7634218db763892 (diff) | |
download | ast2050-yocto-poky-08e5a49afbc4c2b777be61785ecd7854837d6250.zip ast2050-yocto-poky-08e5a49afbc4c2b777be61785ecd7854837d6250.tar.gz |
bitbake: 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]
(Bitbake rev: 8278d7b15b58484af93d952e594f29dabb9200a9)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/projectapp.js | 25 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/project.html | 6 |
2 files changed, 25 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/projectapp.js b/bitbake/lib/toaster/toastergui/static/js/projectapp.js index 74471a1..bee3c56 100644 --- a/bitbake/lib/toaster/toastergui/static/js/projectapp.js +++ b/bitbake/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/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 815c24c..fe3bcf2 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/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> |