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
1=== modified file 'android_build/fixtures/initial_data.json'
2--- android_build/fixtures/initial_data.json 2013-06-12 19:25:45 +0000
3+++ android_build/fixtures/initial_data.json 2013-08-23 12:43:18 +0000
4@@ -127,4 +127,20 @@
5 "pk" : 16,
6 "model" : "auth.group"
7 }
8+ {
9+ "fields" : {
10+ "permissions" : [],
11+ "name" : "linaro-android-member-fujitsu"
12+ },
13+ "pk" : 17,
14+ "model" : "auth.group"
15+ }
16+ {
17+ "fields" : {
18+ "permissions" : [],
19+ "name" : "linaro-android-member-fujitsu-restricted"
20+ },
21+ "pk" : 18,
22+ "model" : "auth.group"
23+ }
24 ]
25
26=== modified file 'android_build/templates/index.html'
27--- android_build/templates/index.html 2013-07-31 06:28:32 +0000
28+++ android_build/templates/index.html 2013-08-23 12:43:18 +0000
29@@ -238,6 +238,7 @@
30 <li>
31 <a id="mhisilicon" href="#mhisilicon"><em>Hisilicon</em></a>
32 </li>
33+ <li><a id="mfujitsu" href="#mfujitsu"><em>Fujitsu</em></a></li>
34 </ul>
35 <div>
36 <div id="mti">
37@@ -475,6 +476,53 @@
38 </div>
39 </div>
40 </div>
41+ <div id="mfujitsu">
42+ <div id="mfujitsutabs">
43+ <ul>
44+ <li><a href="#mfujitsudaily-tab"><em>Daily</em></a></li>
45+ <li><a href="#mfujitsurelease-tab"><em>Release</em></a></li>
46+ <li><a href="#mfujitsurestricted-tab"><em>Restricted</em></a></li>
47+ </ul>
48+ <div>
49+ <div id=mfujitsudaily-tab>
50+ Search: <input class="search" />
51+ Status: <select>
52+ <option value="Any" selected="selected">Any</option>
53+ <option value="OK">Success</option>
54+ <option value="FAILED">Failure</option>
55+ <option value="ABORTED">Aborted</option>
56+ <option value="RUNNING">Building</option>
57+ <option value="">Never built</option>
58+ </select>
59+ <div class="build-table" id="member-fujitsu-build-table"></div>
60+ </div>
61+ <div id=mfujitsurelease-tab>
62+ Search: <input class="search" />
63+ Status: <select>
64+ <option value="Any" selected="selected">Any</option>
65+ <option value="OK">Success</option>
66+ <option value="FAILED">Failure</option>
67+ <option value="ABORTED">Aborted</option>
68+ <option value="RUNNING">Building</option>
69+ <option value="">Never built</option>
70+ </select>
71+ <div class="build-table" id="member-fujitsu-release-build-table"></div>
72+ </div>
73+ <div id=mfujitsurestricted-tab>
74+ Search: <input class="search" />
75+ Status: <select>
76+ <option value="Any" selected="selected">Any</option>
77+ <option value="OK">Success</option>
78+ <option value="FAILED">Failure</option>
79+ <option value="ABORTED">Aborted</option>
80+ <option value="RUNNING">Building</option>
81+ <option value="">Never built</option>
82+ </select>
83+ <div class="build-table" id="member-fujitsu-restricted-build-table"></div>
84+ </div>
85+ </div>
86+ </div>
87+ </div>
88 </div>
89 </div>
90 </div>
91
92=== modified file 'static/index.js'
93--- static/index.js 2013-07-01 14:32:37 +0000
94+++ static/index.js 2013-08-23 12:43:18 +0000
95@@ -14,6 +14,8 @@
96 marm_tabview.render();
97 mhisilicon_tabview = new Y.TabView({ srcNode: '#mhisilicontabs' });
98 mhisilicon_tabview.render();
99+ mfujitsu_tabview = new Y.TabView({ srcNode: '#mfujitsutabs' });
100+ mfujitsu_tabview.render();
101 msubteam_tabview = new Y.TabView({ srcNode: '#msubteams' });
102 msubteam_tabview.render();
103 asubteam_tabview = new Y.TabView({ srcNode: '#asubteams' });
104@@ -167,6 +169,18 @@
105 }
106 });
107
108+ mfujitsu_tabview.on(
109+ 'render',
110+ function (e) {
111+ if (!globalConfig.userName || !in_array(groupsArray, 'linaro-android-member-fujitsu-restricted')) {
112+ var restrictedBuildsTab = mfujitsu_tabview.item(2);
113+ restrictedBuildsTab.on('click', function (e) { e.preventDefault(); });
114+ var restrictedlink = restrictedBuildsTab.get('boundingBox').one('a');
115+ restrictedlink.setStyle('color', 'grey');
116+ restrictedlink.setAttribute('href', globalConfig.loginURL + '?next=' + location.pathname + '%23teams=mfujitsurestricted');
117+ }
118+ });
119+
120 team_tabview.on(
121 'render',
122 function (e) {
123@@ -447,6 +461,23 @@
124 return item.getValue('name').search(/^~linaro-android-member-hisilicon-restricted\//) == 0;
125 }),
126 makeDT(
127+ "#member-fujitsu-build-table",
128+ function (item) {
129+ var group = 'linaro-android-member-fujitsu';
130+ var pattern = new RegExp("^~" + group + "\/(?!.*release).*$");
131+ return item.getValue('name').search(pattern) == 0;
132+ }),
133+ makeDT(
134+ "#member-fujitsu-release-build-table",
135+ function (item) {
136+ return item.getValue('name').search(/^~linaro-android-member-fujitsu\/.*?(?:release).*$/) == 0;
137+ }),
138+ makeDT(
139+ "#member-fujitsu-restricted-build-table",
140+ function (item) {
141+ return item.getValue('name').search(/^~linaro-android-member-fujitsu-restricted\//) == 0;
142+ }),
143+ makeDT(
144 "#user-build-table",
145 (userRegexp ?
146 function (item) { return item.getValue('name').search(userRegexp) == 0; } :

Subscribers

People subscribed via source and target branches