diff options
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/projectapp.js | 8 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/project.html | 6 |
2 files changed, 9 insertions, 5 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 | } |
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 | |||
77 | <script type="text/ng-template" id="change_version_modal"> | 77 | <script type="text/ng-template" id="change_version_modal"> |
78 | <div class="modal-header"> | 78 | <div class="modal-header"> |
79 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> | 79 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> |
80 | <h3>Changing release to {[releaseName]}</h3> | 80 | <h3>Changing release to {[releaseDescription]}</h3> |
81 | </div> | 81 | </div> |
82 | <div class="modal-body"> | 82 | <div class="modal-body"> |
83 | <p>The following project layers do not exist for {[releaseName]}:</p> | 83 | <p>The following project layers do not exist for the {[releaseDescription]} release:</p> |
84 | <ul> | 84 | <ul> |
85 | <li ng-repeat="i in items"><span class="layer-info" data-toggle="tooltip" tooltip="{[i.detail]}">{[i.name]}</span></li> | 85 | <li ng-repeat="i in items"><span class="layer-info" data-toggle="tooltip" tooltip="{[i.detail]}">{[i.name]}</span></li> |
86 | </ul> | 86 | </ul> |
87 | <p>If you change the release to {[releaseName]}, the above layers will be deleted from your project layers.</p> | 87 | <p>If you change the release to {[releaseDescription]}, the above layers will be deleted from your project.</p> |
88 | </div> | 88 | </div> |
89 | <div class="modal-footer"> | 89 | <div class="modal-footer"> |
90 | <button class="btn btn-primary" ng-click="ok()">Change release and delete layers</button> | 90 | <button class="btn btn-primary" ng-click="ok()">Change release and delete layers</button> |