Linaro Android Frontend

Merge lp:~milo/linaro-android-frontend/bug1191013 into lp:linaro-android-frontend

  1. bug1191013
  2. Merge into trunk
Proposed by Milo Casagrande
Status: Merged
Merged at revision: 333
Proposed branch: lp:~milo/linaro-android-frontend/bug1191013
Merge into: lp:linaro-android-frontend
Diff against target: 146 lines (+95/-0)
3 files modified
android_build/fixtures/initial_data.json (+16/-0)
android_build/templates/index.html (+48/-0)
static/index.js (+31/-0)
To merge this branch: bzr merge lp:~milo/linaro-android-frontend/bug1191013
Reviewer Review Type Date Requested Status
Paul Sokolovsky Approve
Linaro Automation & Validation Pending
Review via email: mp+181814@code.launchpad.net

Description of the change

MP to fix bug 1191013: added a Fujitsu member tab to android-build frontend.

To post a comment you must log in.
Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

Well, this looks consistent with handling of other tabs. Was this tested? If not, let's fire a sandbox for it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'android_build/fixtures/initial_data.json'
--- android_build/fixtures/initial_data.json 2013-06-12 19:25:45 +0000
+++ android_build/fixtures/initial_data.json 2013-08-23 12:43:18 +0000
@@ -127,4 +127,20 @@
127 "pk" : 16,127 "pk" : 16,
128 "model" : "auth.group"128 "model" : "auth.group"
129 }129 }
130 {
131 "fields" : {
132 "permissions" : [],
133 "name" : "linaro-android-member-fujitsu"
134 },
135 "pk" : 17,
136 "model" : "auth.group"
137 }
138 {
139 "fields" : {
140 "permissions" : [],
141 "name" : "linaro-android-member-fujitsu-restricted"
142 },
143 "pk" : 18,
144 "model" : "auth.group"
145 }
130]146]
131147
=== modified file 'android_build/templates/index.html'
--- android_build/templates/index.html 2013-07-31 06:28:32 +0000
+++ android_build/templates/index.html 2013-08-23 12:43:18 +0000
@@ -238,6 +238,7 @@
238 <li>238 <li>
239 <a id="mhisilicon" href="#mhisilicon"><em>Hisilicon</em></a>239 <a id="mhisilicon" href="#mhisilicon"><em>Hisilicon</em></a>
240 </li>240 </li>
241 <li><a id="mfujitsu" href="#mfujitsu"><em>Fujitsu</em></a></li>
241 </ul>242 </ul>
242 <div>243 <div>
243 <div id="mti">244 <div id="mti">
@@ -475,6 +476,53 @@
475 </div>476 </div>
476 </div>477 </div>
477 </div>478 </div>
479 <div id="mfujitsu">
480 <div id="mfujitsutabs">
481 <ul>
482 <li><a href="#mfujitsudaily-tab"><em>Daily</em></a></li>
483 <li><a href="#mfujitsurelease-tab"><em>Release</em></a></li>
484 <li><a href="#mfujitsurestricted-tab"><em>Restricted</em></a></li>
485 </ul>
486 <div>
487 <div id=mfujitsudaily-tab>
488 Search: <input class="search" />
489 Status: <select>
490 <option value="Any" selected="selected">Any</option>
491 <option value="OK">Success</option>
492 <option value="FAILED">Failure</option>
493 <option value="ABORTED">Aborted</option>
494 <option value="RUNNING">Building</option>
495 <option value="">Never built</option>
496 </select>
497 <div class="build-table" id="member-fujitsu-build-table"></div>
498 </div>
499 <div id=mfujitsurelease-tab>
500 Search: <input class="search" />
501 Status: <select>
502 <option value="Any" selected="selected">Any</option>
503 <option value="OK">Success</option>
504 <option value="FAILED">Failure</option>
505 <option value="ABORTED">Aborted</option>
506 <option value="RUNNING">Building</option>
507 <option value="">Never built</option>
508 </select>
509 <div class="build-table" id="member-fujitsu-release-build-table"></div>
510 </div>
511 <div id=mfujitsurestricted-tab>
512 Search: <input class="search" />
513 Status: <select>
514 <option value="Any" selected="selected">Any</option>
515 <option value="OK">Success</option>
516 <option value="FAILED">Failure</option>
517 <option value="ABORTED">Aborted</option>
518 <option value="RUNNING">Building</option>
519 <option value="">Never built</option>
520 </select>
521 <div class="build-table" id="member-fujitsu-restricted-build-table"></div>
522 </div>
523 </div>
524 </div>
525 </div>
478 </div>526 </div>
479 </div>527 </div>
480 </div>528 </div>
481529
=== modified file 'static/index.js'
--- static/index.js 2013-07-01 14:32:37 +0000
+++ static/index.js 2013-08-23 12:43:18 +0000
@@ -14,6 +14,8 @@
14 marm_tabview.render();14 marm_tabview.render();
15 mhisilicon_tabview = new Y.TabView({ srcNode: '#mhisilicontabs' });15 mhisilicon_tabview = new Y.TabView({ srcNode: '#mhisilicontabs' });
16 mhisilicon_tabview.render();16 mhisilicon_tabview.render();
17 mfujitsu_tabview = new Y.TabView({ srcNode: '#mfujitsutabs' });
18 mfujitsu_tabview.render();
17 msubteam_tabview = new Y.TabView({ srcNode: '#msubteams' });19 msubteam_tabview = new Y.TabView({ srcNode: '#msubteams' });
18 msubteam_tabview.render();20 msubteam_tabview.render();
19 asubteam_tabview = new Y.TabView({ srcNode: '#asubteams' });21 asubteam_tabview = new Y.TabView({ srcNode: '#asubteams' });
@@ -167,6 +169,18 @@
167 }169 }
168 });170 });
169171
172 mfujitsu_tabview.on(
173 'render',
174 function (e) {
175 if (!globalConfig.userName || !in_array(groupsArray, 'linaro-android-member-fujitsu-restricted')) {
176 var restrictedBuildsTab = mfujitsu_tabview.item(2);
177 restrictedBuildsTab.on('click', function (e) { e.preventDefault(); });
178 var restrictedlink = restrictedBuildsTab.get('boundingBox').one('a');
179 restrictedlink.setStyle('color', 'grey');
180 restrictedlink.setAttribute('href', globalConfig.loginURL + '?next=' + location.pathname + '%23teams=mfujitsurestricted');
181 }
182 });
183
170 team_tabview.on(184 team_tabview.on(
171 'render',185 'render',
172 function (e) {186 function (e) {
@@ -447,6 +461,23 @@
447 return item.getValue('name').search(/^~linaro-android-member-hisilicon-restricted\//) == 0;461 return item.getValue('name').search(/^~linaro-android-member-hisilicon-restricted\//) == 0;
448 }),462 }),
449 makeDT(463 makeDT(
464 "#member-fujitsu-build-table",
465 function (item) {
466 var group = 'linaro-android-member-fujitsu';
467 var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
468 return item.getValue('name').search(pattern) == 0;
469 }),
470 makeDT(
471 "#member-fujitsu-release-build-table",
472 function (item) {
473 return item.getValue('name').search(/^~linaro-android-member-fujitsu\/.*?(?:release).*$/) == 0;
474 }),
475 makeDT(
476 "#member-fujitsu-restricted-build-table",
477 function (item) {
478 return item.getValue('name').search(/^~linaro-android-member-fujitsu-restricted\//) == 0;
479 }),
480 makeDT(
450 "#user-build-table",481 "#user-build-table",
451 (userRegexp ?482 (userRegexp ?
452 function (item) { return item.getValue('name').search(userRegexp) == 0; } :483 function (item) { return item.getValue('name').search(userRegexp) == 0; } :

Subscribers

People subscribed via source and target branches