summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-03-10 17:36:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:44:09 +0000
commit2b629e618227632bc8b774796d760904fcca92f4 (patch)
tree6f4d9d0a5ec5aeb764ab1b57cf22db9617b7ca19
parentfeb95bb04951db2d43875ef9d6b4cef278d91d5e (diff)
downloadpoky-2b629e618227632bc8b774796d760904fcca92f4.tar.gz
bitbake: toastergui: project app build command fix
This patch fixes the build command in the angular project for builds triggered from All targets page. (Bitbake rev: bfd56aa653a1ec7f8777bcb5e627910c3a7ee35b) 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.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/projectapp.js b/bitbake/lib/toaster/toastergui/static/js/projectapp.js
index 82db10781c..6b1bbb40fb 100644
--- a/bitbake/lib/toaster/toastergui/static/js/projectapp.js
+++ b/bitbake/lib/toaster/toastergui/static/js/projectapp.js
@@ -327,7 +327,7 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
327 }).error(function(_data, _status, _headers, _config) { 327 }).error(function(_data, _status, _headers, _config) {
328 if (_status === 0) { 328 if (_status === 0) {
329 // the server has gone away 329 // the server has gone away
330 alert("The server is not responding. The application will terminate now"); 330 // alert("The server is not responding. The application will terminate now");
331 $interval.cancel($scope.pollHandle); 331 $interval.cancel($scope.pollHandle);
332 } 332 }
333 else { 333 else {
@@ -652,9 +652,9 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
652 */ 652 */
653 653
654 $scope.updateDisplayWithCommands = function() { 654 $scope.updateDisplayWithCommands = function() {
655 cmd = $location.path();
656 655
657 function _cmdExecuteWithParam(param, f) { 656 function _cmdExecuteWithParam(param, f) {
657 var cmd = $location.path();
658 if (cmd.indexOf(param) === 0) { 658 if (cmd.indexOf(param) === 0) {
659 if (cmd.indexOf("=") > -1) { 659 if (cmd.indexOf("=") > -1) {
660 var parameter = cmd.split("=", 2)[1]; 660 var parameter = cmd.split("=", 2)[1];
@@ -725,8 +725,9 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
725 _cmdExecuteWithParam("/targetbuild=", function (targets) { 725 _cmdExecuteWithParam("/targetbuild=", function (targets) {
726 var oldTargetName = $scope.targetName; 726 var oldTargetName = $scope.targetName;
727 $scope.targetName = targets.split(",").join(" "); 727 $scope.targetName = targets.split(",").join(" ");
728 $scope.targetNamedBuild(); 728 $scope.buildNamedTarget();
729 $scope.targetName = oldTargetName; 729 $scope.targetName = oldTargetName;
730 $location.path('');
730 }); 731 });
731 732
732 _cmdExecuteWithParam("/machineselect=", function (machine) { 733 _cmdExecuteWithParam("/machineselect=", function (machine) {