diff options
author | Belen Barros Pena <belen.barros.pena@intel.com> | 2015-03-19 14:29:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-25 12:39:54 +0000 |
commit | 792716a385c8c2bcd2a89c8978d4fc988d1fed5c (patch) | |
tree | 0345cc20c4a7252cc6e290a3ef6e27a77ff66c6a /bitbake/lib/toaster/toastergui/static/js/projectapp.js | |
parent | 2b59512e0d08e77940d752b6fac0c08508ac8646 (diff) | |
download | poky-792716a385c8c2bcd2a89c8978d4fc988d1fed5c.tar.gz |
bitbake: toastergui: changes to release change notifications
* Remove the branch name from the list of the layers
deleted (it does not apply).
* In the modal dialog that warns you before layer
deletion, use the release description instead of
the release name
(Bitbake rev: b4ffe490253108e7a009290474e206468255ce12)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/static/js/projectapp.js')
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/projectapp.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/projectapp.js b/bitbake/lib/toaster/toastergui/static/js/projectapp.js index 40e7643822..26e054dc23 100644 --- a/bitbake/lib/toaster/toastergui/static/js/projectapp.js +++ b/bitbake/lib/toaster/toastergui/static/js/projectapp.js | |||
@@ -532,9 +532,10 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc | |||
532 | // activate modal | 532 | // activate modal |
533 | var modalInstance = $modal.open({ | 533 | var modalInstance = $modal.open({ |
534 | templateUrl: 'change_version_modal', | 534 | templateUrl: 'change_version_modal', |
535 | controller: function ($scope, $modalInstance, items, releaseName) { | 535 | controller: function ($scope, $modalInstance, items, releaseName, releaseDescription) { |
536 | $scope.items = items; | 536 | $scope.items = items; |
537 | $scope.releaseName = releaseName; | 537 | $scope.releaseName = releaseName; |
538 | $scope.releaseDescription = releaseDescription; | ||
538 | 539 | ||
539 | $scope.ok = function() { | 540 | $scope.ok = function() { |
540 | $modalInstance.close(); | 541 | $modalInstance.close(); |
@@ -552,6 +553,9 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc | |||
552 | releaseName: function () { | 553 | releaseName: function () { |
553 | return $scope.releases.filter(function (e) { if (e.id == $scope.projectVersion) return e;})[0].name; | 554 | return $scope.releases.filter(function (e) { if (e.id == $scope.projectVersion) return e;})[0].name; |
554 | }, | 555 | }, |
556 | releaseDescription: function () { | ||
557 | return $scope.releases.filter(function (e) { if (e.id == $scope.projectVersion) return e;})[0].description; | ||
558 | }, | ||
555 | } | 559 | } |
556 | }); | 560 | }); |
557 | 561 | ||
@@ -639,7 +643,7 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc | |||
639 | alertText += "<li><strong>"+addedLayers.length+"</strong> layer" + ((addedLayers.length>1)?"s":"") + " changed to the <strong> " + $scope.project.release.name + " </strong> branch: " + addedLayers.map(function (e) { return "<a href=\""+e.layerdetailurl+"\">"+e.name+"</a>"; }).join(", ") + "</li>"; | 643 | alertText += "<li><strong>"+addedLayers.length+"</strong> layer" + ((addedLayers.length>1)?"s":"") + " changed to the <strong> " + $scope.project.release.name + " </strong> branch: " + addedLayers.map(function (e) { return "<a href=\""+e.layerdetailurl+"\">"+e.name+"</a>"; }).join(", ") + "</li>"; |
640 | } | 644 | } |
641 | if (deletedLayers.length > 0) { | 645 | if (deletedLayers.length > 0) { |
642 | alertText += "<li><strong>"+deletedLayers.length+"</strong> layer" + ((deletedLayers.length>1)?"s":"") + " deleted from the <strong> " + $scope.project.release.name + " </strong> branch: " + deletedLayers.map(function (e) { return "<a href=\""+e.layerdetailurl+"\">"+e.name+"</a>"; }).join(", ") + "</li>"; | 646 | alertText += "<li><strong>"+deletedLayers.length+"</strong> layer" + ((deletedLayers.length>1)?"s":"") + " deleted: " + deletedLayers.map(function (e) { return "<a href=\""+e.layerdetailurl+"\">"+e.name+"</a>"; }).join(", ") + "</li>"; |
643 | } | 647 | } |
644 | 648 | ||
645 | } | 649 | } |