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 // activate modal var modalInstance = $modal.open({ templateUrl: 'change_version_modal', - controller: function ($scope, $modalInstance, items, releaseName) { + controller: function ($scope, $modalInstance, items, releaseName, releaseDescription) { $scope.items = items; $scope.releaseName = releaseName; + $scope.releaseDescription = releaseDescription; $scope.ok = function() { $modalInstance.close(); @@ -552,6 +553,9 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc releaseName: function () { return $scope.releases.filter(function (e) { if (e.id == $scope.projectVersion) return e;})[0].name; }, + releaseDescription: function () { + return $scope.releases.filter(function (e) { if (e.id == $scope.projectVersion) return e;})[0].description; + }, } }); @@ -639,7 +643,7 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc 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 from the " + $scope.project.release.name + " branch: " + deletedLayers.map(function (e) { return ""+e.name+""; }).join(", ") + "
  • "; + alertText += "
  • "+deletedLayers.length+" layer" + ((deletedLayers.length>1)?"s":"") + " deleted: " + deletedLayers.map(function (e) { return ""+e.name+""; }).join(", ") + "
  • "; } } diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 65c0919bc9..d208bf8cfb 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html @@ -77,14 +77,14 @@ vim: expandtab tabstop=2