mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-04 22:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toaster: projectapp Add links to the imported layers notify

Browse Source 
Adds links to layer details for each of the layers that has been added
to the project.

(Bitbake rev: 07e5c7c82519604501feb7d892db330c610978e9)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood
2014-12-08 15:29:01 +00:00
committed by Richard Purdie
parent 8d96256c39
commit c89fd79398
4 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bitbake/lib/toaster/toastergui/static/js/importlayer.js
View File

@@ -152,9 +152,8 @@ function importLayerPageInit (ctx) {
show_error_message(data, layerData);
console.log(data.error);
} else {
layerData.layersAdded = data.layers_added;
/* Success layer import now go to the project page */
$.cookie('layer-imported-alert', JSON.stringify(layerData), { path: '/'});
$.cookie('layer-imported-alert', JSON.stringify(data), { path: '/'});
window.location.replace(ctx.projectPageUrl+'#/layerimported');
}
},

29
bitbake/lib/toaster/toastergui/static/js/projectapp.js
View File

@@ -578,18 +578,31 @@ projectApp.controller('prjCtrl', function($scope, $modal, $http, $interval, $loc
if (!imported)
return;
if (imported.layersAdded.length == 0) {
text = "You have imported <strong>"+imported.name+
"</strong> and added it to your project.";
if (imported.deps_added.length == 0) {
text = "You have imported <strong><a href=\""+$scope.urls.layer+
imported.imported_layer.id+"\">"+imported.imported_layer.name+
"</a></strong> and added it to your project.";
} else {
text = "You have imported <strong>"+imported.name+
"</strong> and added <strong>"+imported.layersAdded.length+
"</strong> layers to your project. <strong>"+
imported.layersAdded.join(", ")+"</strong>";
var links = "<a href=\""+$scope.urls.layer+
imported.imported_layer.id+"\">"+imported.imported_layer.name+
"</a>, ";
imported.deps_added.map (function(item, index){
links +="<a href=\""+$scope.urls.layer+item.id+"\" >"+item.name+
"</a>";
/*If we're at the last element we don't want the trailing comma */
if (imported.deps_added[index+1] != undefined)
links += ", ";
});
/* Length + 1 here to do deps + the imported layer */
text = "You have imported <strong><a href=\""+$scope.urls.layer+
imported.imported_layer.id+"\">"+imported.imported_layer.name+
"</a></strong> and added <strong>"+(imported.deps_added.length+1)+
"</strong> layers to your project. <strong>"+links+"</strong>";
}
$scope.displayAlert($scope.zone2alerts, text, "alert-info");
// This doesn't work
$cookieStore.remove("layer-imported-alert");
//use jquery plugin instead

3
bitbake/lib/toaster/toastergui/templates/project.html
View File

@@ -382,7 +382,8 @@ angular.element(document).ready(function() {
scope.urls.xhr_datatypeahead = "{% url 'xhr_datatypeahead' %}";
scope.urls.layers = "{% url 'layers' %}";
scope.urls.targets = "{% url 'targets' %}";
scope.urls.importlayer = "{% url 'importlayer'%}"
scope.urls.importlayer = "{% url 'importlayer'%}";
scope.urls.layer = "{% url 'layerdetails' %}";
scope.project = {{prj|json}};
scope.builds = {{builds|json}};
scope.layers = {{layers|json}};

4
bitbake/lib/toaster/toastergui/views.py
View File

@@ -2322,7 +2322,7 @@ if toastermain.settings.MANAGED:
continue
if prj_layer_created:
layers_added.append(Layer.objects.get(id=layer_dep_obj.layer_id).name)
layers_added.append({'id': layer_dep_obj.id, 'name': Layer.objects.get(id=layer_dep_obj.layer_id).name})
# If an old layer version exists in our project then remove it
@@ -2342,7 +2342,7 @@ if toastermain.settings.MANAGED:
return HttpResponse(jsonfilter({"error": "Uncaught error: Could not create layer version"}), content_type = "application/json")
return HttpResponse(jsonfilter({"error": "ok", "layers_added": layers_added}), content_type = "application/json")
return HttpResponse(jsonfilter({"error": "ok", "imported_layer" : { "name" : layer.name, "id": layer_version.id }, "deps_added": layers_added }), content_type = "application/json")