Changeset 0bd161f

Timestamp:

Aug 14, 2011, 8:28:33 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

33b19c3

Parents:

aa6a940

git-author:

Alex Dehnert <adehnert@…> (08/14/11 19:42:20)

git-committer:

Alex Dehnert <adehnert@…> (08/14/11 20:28:33)

Message:

Add notes

There's currently no particularly good UI for adding new notes.
But it is possible, and viewing works fine

Location:

asadb

Files:

• groups/admin.py (modified) (2 diffs)
• groups/migrations/0009_add_notes.py (added)
• groups/models.py (modified) (2 diffs)
• groups/views.py (modified) (1 diff)
• template/groups/group_detail.html (modified) (1 diff)
• template/groups/note/detail.head.html (added)
• template/groups/note/detail.row.html (added)

asadb/groups/admin.py

@@ -25 +25 @@
     date_hierarchy = 'update_date'
     search_fields = [ 'id', 'name', 'abbreviation', 'officer_email', 'athena_locker', ]
+
+class Admin_GroupNote(VersionAdmin):
+    list_display = (
+        'pk',
+        'author',
+        'timestamp',
+        'acl_read_group',
+        'acl_read_offices',
+        'group',
+    )
+    list_display_links = ('pk', 'timestamp', )
+    list_filter = [
+        'acl_read_group',
+        'acl_read_offices',
+    ]
+    date_hierarchy = 'timestamp'
+    search_fields = [
+        'author',
+        'group__name',
+        'group__abbreviation',
+        'group__officer_email',
+        'group__athena_locker',
+    ]
 
 class OfficerRoleAdmin(VersionAdmin):
@@ -129 +152 @@
 
 admin.site.register(groups.models.Group, GroupAdmin)
+admin.site.register(groups.models.GroupNote, Admin_GroupNote)
 admin.site.register(groups.models.OfficerRole, OfficerRoleAdmin)
 admin.site.register(groups.models.OfficeHolder, OfficeHolderAdmin)

asadb/groups/models.py

@@ -50 +50 @@
         super(Group, self).save()
 
+    def viewable_notes(self, user):
+        return GroupNote.viewable_notes(self, user)
+
     def officers(self, role=None, person=None, as_of="now",):
         """Get the set of people holding some office.
@@ -83 +86 @@
             ('admin_group', 'Administer basic group information'),
             ('view_signatories', 'View signatory information for all groups'),
+        )
+
+
+class GroupNote(models.Model):
+    author = models.CharField(max_length=30, ) # match Django username field
+    timestamp = models.DateTimeField(default=datetime.datetime.now, editable=False, )
+    body = models.TextField()
+    acl_read_group = models.BooleanField(default=True, help_text='Can the group read this note')
+    acl_read_offices = models.BooleanField(default=True, help_text='Can "offices" that interact with groups (SAO, CAC, and funding boards) read this note')
+    group = models.ForeignKey(Group)
+
+    def __str__(self, ):
+        return "Note by %s on %s" % (self.author, self.timestamp, )
+
+    @classmethod
+    def viewable_notes(cls, group, user):
+        notes = cls.objects.filter(group=group)
+        if not user.has_perm('groups.view_note_all'):
+            q = models.Q(pk=0)
+            if user.has_perm('groups.view_note_group', group):
+                q |= models.Q(acl_read_group=True)
+            if user.has_perm('groups.view_note_office'):
+                q |= models.Q(acl_read_offices=True)
+            notes = notes.filter(q)
+        return notes
+
+    class Meta:
+        permissions = (
+            ('view_note_group',     'View notes intended for the group to see', ),
+            ('view_note_office',    'View notes intended for "offices" to see', ),
+            ('view_note_all',       'View all notes', ),
         )
 

asadb/groups/views.py

@@ -184 +184 @@
         context['viewpriv'] = self.request.user.has_perm('groups.view_group_private_info', group)
         context['adminpriv'] = self.request.user.has_perm('groups.admin_group', group)
+        context['notes'] = group.viewable_notes(self.request.user)
+
         return context
 

asadb/template/groups/group_detail.html

@@ -71 +71 @@
 </table>
 
+<h2>Notes</h2>
+
+{% if notes %}
+<table class='pretty-table'>
+<thead>
+{% include "groups/note/detail.head.html" %}
+</thead>
+<tbody>
+{% for note in notes %}
+{% include "groups/note/detail.row.html" %}
+{% endfor %}
+</tbody>
+</table>
+{% else %}
+<p>No notes are visible to you at this time.</p>
+{% endif %}
+
+{% if perms.groups.add_groupnote %}
+<p><a href='{% url admin:groups_groupnote_add %}'>Add note</a></p>
+{% endif %}
+
 {% endblock %}