Merge lp:~salgado/offspring/privacy-indication-on-lists into lp:~linaro-automation/offspring/private-builds

Proposed by Guilherme Salgado
Status: Merged
Approved by: James Tunnicliffe
Approved revision: 66
Merged at revision: 66
Proposed branch: lp:~salgado/offspring/privacy-indication-on-lists
Merge into: lp:~linaro-automation/offspring/private-builds
Diff against target: 31 lines (+8/-0)
2 files modified
lib/offspring/web/templates/queuemanager/builds.html (+4/-0)
lib/offspring/web/templates/queuemanager/projects.html (+4/-0)
To merge this branch: bzr merge lp:~salgado/offspring/privacy-indication-on-lists
Reviewer Review Type Date Requested Status
James Tunnicliffe (community) Approve
Review via email: mp+79872@code.launchpad.net

Description of the change

Show a small padlock icon next to private projects on both the list of projects and the list of builds.
(untested because we don't want to write tests for every bit of the UI and there's no risk of leaking any private data here)

To post a comment you must log in.
Revision history for this message
James Tunnicliffe (dooferlad) wrote :

Good stuff.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'lib/offspring/web/media/images/padlock-small.png'
2Binary files lib/offspring/web/media/images/padlock-small.png 1970-01-01 00:00:00 +0000 and lib/offspring/web/media/images/padlock-small.png 2011-10-19 18:34:23 +0000 differ
3=== modified file 'lib/offspring/web/templates/queuemanager/builds.html'
4--- lib/offspring/web/templates/queuemanager/builds.html 2011-08-13 06:30:36 +0000
5+++ lib/offspring/web/templates/queuemanager/builds.html 2011-10-19 18:34:23 +0000
6@@ -31,6 +31,10 @@
7 <a title="View project details" href="{% url offspring.web.queuemanager.views.project_details build_result.project.name %}">
8 {{ build_result.project.title }}
9 </a>
10+ {% if build_result.project.is_private %}
11+ <img src="/assets/images/padlock-small.png"
12+ title="This project is private" />
13+ {% endif %}
14 </td>
15 <td>
16 {% if build_result.name %}
17
18=== modified file 'lib/offspring/web/templates/queuemanager/projects.html'
19--- lib/offspring/web/templates/queuemanager/projects.html 2011-08-13 06:30:36 +0000
20+++ lib/offspring/web/templates/queuemanager/projects.html 2011-10-19 18:34:23 +0000
21@@ -41,6 +41,10 @@
22 </td>
23 <td>
24 <a href="{% url offspring.web.queuemanager.views.project_details project.name %}">{{ project.title }}</a>
25+ {% if project.is_private %}
26+ <img src="/assets/images/padlock-small.png"
27+ title="This project is private" />
28+ {% endif %}
29 </td>
30 <td>
31 {{project.get_status_display|default_if_none:"Unknown"}}

Subscribers

People subscribed via source and target branches