Merge lp:~salgado/offspring/acl-sidebar into lp:~linaro-automation/offspring/linaro

[Guilherme Salgado]

Show a padlock on the heading of private project/build pages and also list the users who are allowed to see a given project, followed by a link to edit that list.

[James Tunnicliffe (dooferlad)]

I haven't tested it, but it looks fine. Not sure if we need the "you can't see this page, but these people can" bit, but I think it should be left in while we get things running and demo it for the users. If they want to take it out, it should be simple enough.

review: Approve

[Guilherme Salgado (salgado)]

On Wed, 2011-10-12 at 15:34 +0000, James Tunnicliffe wrote:
> Review: Approve
>
> I haven't tested it, but it looks fine. Not sure if we need the "you can't see this page, but these people can" bit, but I think it should be left in while we get things running and demo it for the users. If they want to take it out, it should be simple enough.

Oh, but that's not shown if you don't have the rights to see the
project. If you don't have the rights all you get is HTTP 404 (one of my
previous branches do that) as if the project didn't exist.

[Guilherme Salgado (salgado)]

In fact this was merged into our integration branch (lp:~linaro-infrastructure/offspring/private-builds)

=== added file 'lib/offspring/web/media/images/padlock.png'
Binary files lib/offspring/web/media/images/padlock.png	1970-01-01 00:00:00 +0000 and lib/offspring/web/media/images/padlock.png	2011-10-10 20:45:29 +0000 differ
=== modified file 'lib/offspring/web/queuemanager/views.py'
--- lib/offspring/web/queuemanager/views.py	2011-10-10 20:45:29 +0000
+++ lib/offspring/web/queuemanager/views.py	2011-10-10 20:45:29 +0000
@@ -146,6 +146,7 @@
         'upcoming_milestones' : LaunchpadProjectMilestone.upcoming_milestones(),
         'recent_milestones' : LaunchpadProjectMilestone.recent_milestones(),
         'project' : b.project, 
+        'is_private': b.is_private,
         'build' : b
     }
     return render_to_response(
@@ -253,6 +254,7 @@
         'include_sources_list': config.web('archive_uri', None) is not None,
         'pillar' : 'projects',
         'project' : p,
+        'is_private': p.is_private,
         'project_build_results' : project_build_results,
         'releases_url': releases_url,
         }

=== modified file 'lib/offspring/web/templates/base.html'
--- lib/offspring/web/templates/base.html	2011-08-13 06:30:36 +0000
+++ lib/offspring/web/templates/base.html	2011-10-10 20:45:29 +0000
@@ -56,7 +56,13 @@
 	<div id="content">
 		<div class="post greenbox">
 			<div class="page_title">
-				<h1>{% block title %}{% endblock %}</h1>
+				<h1>{% block title %}{% endblock %}
+				{% if is_private %}
+					<img style="float: right"
+					     src="/assets/images/padlock.png"
+					     title="The information on this page is private" />
+				{% endif %}
+			        </h1>
 			</div>
 			<div class="entry" id="entry" style="padding-bottom: 0px">{% block content %}{% endblock %}</div>
 			<div class="btm" id="btm">

=== modified file 'lib/offspring/web/templates/queuemanager/project_details.html'
--- lib/offspring/web/templates/queuemanager/project_details.html	2011-02-17 09:03:04 +0000
+++ lib/offspring/web/templates/queuemanager/project_details.html	2011-10-10 20:45:29 +0000
@@ -426,6 +426,11 @@
 </dl>
 
 <dl>
+    <dt>Owner:</dt>
+    <dd>{{project.owner.get_full_name}}</dd>
+</dl>
+
+<dl>
     <dt>Group:</dt>
     <dd>{%if project.project_group%} <a href="{{ project.project_group.get_absolute_url }}">{{project.project_group.title}}</a>{%else%}None{%endif%}</dd>
 </dl>
@@ -465,6 +470,40 @@
     <dd>{{ project.config_url }}</a></dd>
 </dl>
 
+{% if project.is_private %}
+  <dl style="width: 96%;" >
+    {% if project.access_groups.all.count %}
+      <dt>This project is visible only to its owner and the following
+      users:</dt>
+      <dd>
+        <ul>
+          {% for user in project.access_groups.all.0.members.all %}
+            <li>
+              {% if user.get_full_name %}
+                {{ user.get_full_name }}
+              {% else %}
+                {{ user.username }}
+              {% endif %}
+              ({{ user.email }})
+            </li>
+          {% endfor %}
+        </ul>
+        <p>
+          <a href="{% url offspring.web.queuemanager.views.project_acl project.name %}"
+            >Allow more users to see this project</a>
+        </p>
+      </dd>
+    {% else %}
+      <dt>This project is visible only to its owner.</dt>
+      <dd>
+        <p>
+          <a href="{% url offspring.web.queuemanager.views.project_acl project.name %}"
+            >Allow more users to see this project</a>
+        </p>
+    {% endif %}
+  </dl>
+{% endif %}
+
 <div style="clear: both;"></div>
 </div>