Changeset 59ed3da

Timestamp:

Apr 16, 2012, 11:36:22 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

b38a26a

Parents:

bc7d506

git-author:

Alex Dehnert <adehnert@…> (04/16/12 23:36:22)

git-committer:

Alex Dehnert <adehnert@…> (04/16/12 23:36:22)

Message:

Allow read-only access to the space page

This mostly fixes ASA Trac #92.

Location:

asadb

Files:

• space/views.py (modified) (4 diffs)
• template/space/manage-access.html (modified) (3 diffs)

asadb/space/views.py

@@ -44 +44 @@
 def manage_access(request, pk, ):
     group = get_object_or_404(groups.models.Group, pk=pk)
-    if not request.user.has_perm('groups.admin_group', group):
+
+    priv_view = request.user.has_perm('groups.view_group_private_info', group)
+    priv_admin = request.user.has_perm('groups.admin_group', group)
+    priv_rw = priv_admin
+    if not (priv_view or priv_admin):
         raise PermissionDenied
+
     office_access = group.officers(role='office-access')
     locker_access = group.officers(role='locker-access')
@@ -52 +57 @@
     locker_pairs = []
     changes = []
-    extras_indices = range(6)
-    if request.method == 'POST':
+    if priv_rw:
+        extras_indices = range(6)
+    else:
+        extras_indices = []
+    if request.method == 'POST' and priv_rw:
         edited = True
     else:
@@ -71 +79 @@
         pair = (assignment, entries)
         pairs.append(pair)
-    submit_button = (len(office_pairs) + len(locker_pairs)) > 0
+    allow_edit = priv_rw and ((len(office_pairs) + len(locker_pairs)) > 0)
     context = {
         'group': group,
@@ -79 +87 @@
         'locker_pairs': locker_pairs,
         'changes': changes,
-        'submit_button': submit_button,
+        'allow_edit': allow_edit,
         'extras_indices': extras_indices,
         'pagename':'group',

asadb/template/space/manage-access.html

@@ -50 +50 @@
         <table class='pretty-table'>
             <tr>
-                <th>Grant</th>
+                {%if allow_edit%}<th>Grant</th>{%endif%}
                 <th>Name</th>
                 <th>MIT ID</th>
@@ -56 +56 @@
         {% for entry in entries %}
             <tr>
-                <td><input type='checkbox' name='grant[{{assignment.pk}}][{{entry.pk}}]' checked='checked'></td>
+                {%if allow_edit%}<td><input type='checkbox' name='grant[{{assignment.pk}}][{{entry.pk}}]' checked='checked'></td>{% endif %}
                 <td>{{entry.name}}</td>
                 <td>{{entry.card_number}}</td>
@@ -110 +110 @@
 {% endif %}
 
-{% if submit_button %}
+{% if allow_edit %}
 <input type='submit' name='submit' value='Update' />
 {% endif %}