Merge lp:~pfalcon/linaro-android-frontend/show-description into lp:linaro-android-frontend

Proposed by Paul Sokolovsky
Status: Merged
Approved by: James Westby
Approved revision: 229
Merged at revision: 229
Proposed branch: lp:~pfalcon/linaro-android-frontend/show-description
Merge into: lp:linaro-android-frontend
Diff against target: 33 lines (+4/-1)
2 files modified
android_build/templates/buildDetails.html (+2/-0)
static/buildDetails.js (+2/-1)
To merge this branch: bzr merge lp:~pfalcon/linaro-android-frontend/show-description
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+65564@code.launchpad.net

Description of the change

Show job description, as specified in Jenkins, on cloud-buildd frontend page for the job. Implementation of https://blueprints.launchpad.net/linaro-android/+spec/linaro-android-add-usage-doc-to-build-page

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'android_build/templates/buildDetails.html'
2--- android_build/templates/buildDetails.html 2011-03-25 00:11:52 +0000
3+++ android_build/templates/buildDetails.html 2011-06-22 20:16:32 +0000
4@@ -18,6 +18,8 @@
5 <input id="delete" type="button" value="deleteā€¦" />
6 {% endif %}
7 </p>
8+ <p id="job-description">
9+ </p>
10 <p id="built-daily-details" class="hidden">
11 This build is <span id="not-built-daily" class="hidden">not</span>
12 built daily.
13
14=== modified file 'static/buildDetails.js'
15--- static/buildDetails.js 2011-03-17 01:37:06 +0000
16+++ static/buildDetails.js 2011-06-22 20:16:32 +0000
17@@ -20,7 +20,7 @@
18
19 var buildName = rawBuildName.replace('/', '_').substring(1);
20
21- var treeExp = 'actions[parameterDefinitions[defaultParameterValue[value],name]],builds[number],queueItem[params]';
22+ var treeExp = 'actions[parameterDefinitions[defaultParameterValue[value],name]],builds[number],queueItem[params],description';
23 if (fetchLatest) {
24 treeExp += ',lastBuild[' + jobData + ']';
25 }
26@@ -144,6 +144,7 @@
27 on: {
28 success: function (e, response) {
29 var job = Y.JSON.parse(response.responseText);
30+ Y.one("#job-description").setContent(job.description);
31 Y.all('.build-found').removeClass('hidden');
32 Y.Array.each(
33 job.actions[0].parameterDefinitions,

Subscribers

People subscribed via source and target branches