summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2014-10-31 19:17:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-06 16:45:23 +0000
commit7bd03ac24114b2c6015144a37e0c3fb4037baea6 (patch)
tree4212cc8e1d8f6d0e63445476f6d72dda7aa97956 /bitbake
parentfc75011506c2109bb060c4d0c30266603a39ac6d (diff)
downloadpoky-7bd03ac24114b2c6015144a37e0c3fb4037baea6.tar.gz
bitbake: toastergui: fix invalid build url usage
We need to pass the URL for the build action as javascript parameter, since the project ID is different for each build, instead of using the project id of the most-recently-used project. (Bitbake rev: 35c1de4b05c64ee1c436be2dfbd97dcf9ed9ed71) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/mrb_section.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
index 5ba0b08495..3d17ac62e4 100644
--- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html
+++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html
@@ -44,7 +44,7 @@
44 Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent|sectohms }}</a> 44 Build time: <a href="{% url 'buildtime' build.pk %}">{{ build.timespent|sectohms }}</a>
45 </span> 45 </span>
46 {% if build.project %} 46 {% if build.project %}
47 <a class="btn {%if build.outcome == build.SUCCEEDED%}btn-success{%elif build.outcome == build.FAILED%}btn-danger{%else%}btn-info{%endif%} pull-right" onclick="scheduleBuild({{build.project.name|json}}, {{build.get_sorted_target_list|mapselect:'target'|json}})">Run again</a> 47 <a class="btn {%if build.outcome == build.SUCCEEDED%}btn-success{%elif build.outcome == build.FAILED%}btn-danger{%else%}btn-info{%endif%} pull-right" onclick="scheduleBuild({%url 'xhr_projectbuild' build.project.id as myurl %}{{myurl|json}}, {{build.project.name|json}}, {{build.get_sorted_target_list|mapselect:'target'|json}})">Run again</a>
48 {% endif %} 48 {% endif %}
49 </div> 49 </div>
50 {%endif%} 50 {%endif%}
@@ -64,10 +64,10 @@
64 64
65<script> 65<script>
66 66
67function _makeXHRBuildCall(data, onsuccess, onfail) { 67function _makeXHRBuildCall(url, data, onsuccess, onfail) {
68 $.ajax( { 68 $.ajax( {
69 type: "POST", 69 type: "POST",
70 url: "{% url 'xhr_projectbuild' project.id %}", 70 url: url,
71 data: data, 71 data: data,
72 headers: { 'X-CSRFToken' : $.cookie('csrftoken')}, 72 headers: { 'X-CSRFToken' : $.cookie('csrftoken')},
73 success: function (_data) { 73 success: function (_data) {
@@ -86,9 +86,9 @@ function _makeXHRBuildCall(data, onsuccess, onfail) {
86} 86}
87 87
88 88
89function scheduleBuild(projectName, buildlist) { 89function scheduleBuild(url, projectName, buildlist) {
90 console.log("scheduleBuild"); 90 console.log("scheduleBuild");
91// _makeXHRBuildCall({targets: buildlist.join(" ")}, function (_data) { 91// _makeXHRBuildCall(url , {targets: buildlist.join(" ")}, function (_data) {
92 92
93 $('#latest-builds').prepend('<div class="alert alert-info" style="padding-top:0px">' + '<span class="label label-info" style="font-weight: normal; margin-bottom: 5px; margin-left:-15px; padding-top:5px;">'+projectName+'</span><div class="row-fluid">' + 93 $('#latest-builds').prepend('<div class="alert alert-info" style="padding-top:0px">' + '<span class="label label-info" style="font-weight: normal; margin-bottom: 5px; margin-left:-15px; padding-top:5px;">'+projectName+'</span><div class="row-fluid">' +
94 '<div class="span4 lead">' + buildlist.join(" ") + 94 '<div class="span4 lead">' + buildlist.join(" ") +