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
=== modified file 'android_build/templates/buildDetails.html'
--- android_build/templates/buildDetails.html 2011-03-25 00:11:52 +0000
+++ android_build/templates/buildDetails.html 2011-06-22 20:16:32 +0000
@@ -18,6 +18,8 @@
18 <input id="delete" type="button" value="delete…" />18 <input id="delete" type="button" value="delete…" />
19 {% endif %}19 {% endif %}
20 </p>20 </p>
21 <p id="job-description">
22 </p>
21 <p id="built-daily-details" class="hidden">23 <p id="built-daily-details" class="hidden">
22 This build is <span id="not-built-daily" class="hidden">not</span>24 This build is <span id="not-built-daily" class="hidden">not</span>
23 built daily.25 built daily.
2426
=== modified file 'static/buildDetails.js'
--- static/buildDetails.js 2011-03-17 01:37:06 +0000
+++ static/buildDetails.js 2011-06-22 20:16:32 +0000
@@ -20,7 +20,7 @@
2020
21 var buildName = rawBuildName.replace('/', '_').substring(1);21 var buildName = rawBuildName.replace('/', '_').substring(1);
2222
23 var treeExp = 'actions[parameterDefinitions[defaultParameterValue[value],name]],builds[number],queueItem[params]';23 var treeExp = 'actions[parameterDefinitions[defaultParameterValue[value],name]],builds[number],queueItem[params],description';
24 if (fetchLatest) {24 if (fetchLatest) {
25 treeExp += ',lastBuild[' + jobData + ']';25 treeExp += ',lastBuild[' + jobData + ']';
26 }26 }
@@ -144,6 +144,7 @@
144 on: {144 on: {
145 success: function (e, response) {145 success: function (e, response) {
146 var job = Y.JSON.parse(response.responseText);146 var job = Y.JSON.parse(response.responseText);
147 Y.one("#job-description").setContent(job.description);
147 Y.all('.build-found').removeClass('hidden');148 Y.all('.build-found').removeClass('hidden');
148 Y.Array.each(149 Y.Array.each(
149 job.actions[0].parameterDefinitions,150 job.actions[0].parameterDefinitions,

Subscribers

People subscribed via source and target branches