diff --git a/bitbake/lib/toaster/toastergui/static/js/projectapp.js b/bitbake/lib/toaster/toastergui/static/js/projectapp.js
index 6b1bbb40fb..40e7643822 100644
--- a/bitbake/lib/toaster/toastergui/static/js/projectapp.js
+++ b/bitbake/lib/toaster/toastergui/static/js/projectapp.js
@@ -608,7 +608,6 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
// requirement https://bugzilla.yoctoproject.org/attachment.cgi?id=2229, notification for changed version to include layers
$scope.zone2alerts.forEach(function (e) { e.close(); });
- alertText += "This has caused the following changes in your project layers:
";
// warnings - this is executed AFTER the generic XHRCall handling is done; at this point,
@@ -620,6 +619,10 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
function (e) {addedLayers.push(e); },
function (e) {deletedLayers.push(e); });
+ var hasDifferentLayers = (addedLayers.length || deletedLayers.length)
+ if (hasDifferentLayers) {
+ alertText += "This has caused the following changes in your project layers:";
+ }
// some of the deleted layers are actually replaced (changed) layers
var changedLayers = [];
deletedLayers.forEach(function (e) {
@@ -633,14 +636,16 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
});
if (addedLayers.length > 0) {
- alertText += "- "+addedLayers.length+" layer" + ((addedLayers.length>1)?"s changed: ":" changed: ") + addedLayers.map(function (e) { return ""+e.name+""; }).join(", ") + "
";
+ alertText += "- "+addedLayers.length+" layer" + ((addedLayers.length>1)?"s":"") + " changed to the " + $scope.project.release.name + " branch: " + addedLayers.map(function (e) { return ""+e.name+""; }).join(", ") + "
";
}
if (deletedLayers.length > 0) {
- alertText += "- "+deletedLayers.length+" layer" + ((deletedLayers.length>1)?"s deleted: ":"deleted: ") + deletedLayers.map(function (e) { return ""+e.name+""; }).join(", ") + "
";
+ alertText += "- "+deletedLayers.length+" layer" + ((deletedLayers.length>1)?"s":"") + " deleted from the " + $scope.project.release.name + " branch: " + deletedLayers.map(function (e) { return ""+e.name+""; }).join(", ") + "
";
}
}
- alertText += "
";
+ if (hasDifferentLayers) {
+ alertText += "
";
+ }
}
$scope.displayAlert(alertZone, alertText, "alert-info");
});