Changeset b713ac7

Timestamp:

Aug 8, 2011, 3:06:46 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

7f16c8e

Parents:

0abb44b

git-author:

Alex Dehnert <adehnert@…> (08/08/11 03:06:46)

git-committer:

Alex Dehnert <adehnert@…> (08/08/11 03:06:46)

Message:

Add class/status/funding

Location:

asadb/groups

Files:

• admin.py (modified) (3 diffs)
• migrations/0007_add_statusy_stuff.py (added)
• migrations/0008_add_statusy_stuff_data.py (added)
• models.py (modified) (2 diffs)

asadb/groups/admin.py

@@ -17 +17 @@
     )
     list_display_links = ('id', 'name', )
-    list_filter = [ 'activity_category', ]
+    list_filter = [
+        'activity_category',
+        'group_class',
+        'group_status',
+        'group_funding',
+    ]
     date_hierarchy = 'update_date'
     search_fields = [ 'id', 'name', 'abbreviation', 'officer_email', 'athena_locker', ]
@@ -63 +68 @@
     list_display_links = ('id', 'name', )
 
+class Admin_GroupClass(admin.ModelAdmin):
+    list_display = (
+        'id',
+        'name',
+        'slug',
+        'gets_publicity',
+    )
+    list_display_links = ('id', 'name', 'slug', )
+    list_filter = [ 'gets_publicity', ]
+    prepopulated_fields = {'slug': ('name', )}
+
+class Admin_GroupStatus(admin.ModelAdmin):
+    list_display = (
+        'id',
+        'name',
+        'slug',
+        'is_active',
+    )
+    list_display_links = ('id', 'name', 'slug', )
+    list_filter = [ 'is_active', ]
+    prepopulated_fields = {'slug': ('name', )}
+
+class Admin_GroupFunding(admin.ModelAdmin):
+    list_display = (
+        'id',
+        'name',
+        'slug',
+        'contact_email',
+        'funding_list',
+    )
+    list_display_links = ('id', 'name', 'slug', )
+    prepopulated_fields = {'slug': ('name', )}
+
+class Admin_GroupClass(admin.ModelAdmin):
+    list_display = (
+        'id',
+        'name',
+        'slug',
+        'gets_publicity',
+    )
+    list_display_links = ('id', 'name', 'slug', )
+    list_filter = [ 'gets_publicity', ]
+    prepopulated_fields = {'slug': ('name', )}
+
 class Admin_AthenaMoiraAccount(admin.ModelAdmin):
     list_display = (
@@ -83 +132 @@
 admin.site.register(groups.models.OfficeHolder, OfficeHolderAdmin)
 admin.site.register(groups.models.ActivityCategory, ActivityCategoryAdmin)
+admin.site.register(groups.models.GroupClass, Admin_GroupClass)
+admin.site.register(groups.models.GroupStatus, Admin_GroupStatus)
+admin.site.register(groups.models.GroupFunding, Admin_GroupFunding)
 admin.site.register(groups.models.AthenaMoiraAccount, Admin_AthenaMoiraAccount)

asadb/groups/models.py

@@ -10 +10 @@
     description = models.TextField()
     activity_category = models.ForeignKey('ActivityCategory', null=True, blank=True, )
+    group_class = models.ForeignKey('GroupClass')
+    group_status = models.ForeignKey('GroupStatus')
+    group_funding = models.ForeignKey('GroupFunding', null=True, blank=True, )
     website_url = models.URLField()
     constitution_url = models.CharField(max_length=200, blank=True)
@@ -153 +156 @@
 
 
+class GroupClass(models.Model):
+    name = models.CharField(max_length=50)
+    slug = models.SlugField(unique=True, )
+    description = models.TextField()
+    gets_publicity = models.BooleanField(help_text="Gets publicity resources such as FYSM or Activities Midway")
+
+    def __str__(self, ):
+        publicity = "no publicity"
+        if self.gets_publicity:
+            publicity = "gets publicity"
+        return "%s (%s)" % (self.name, publicity, )
+
+    class Meta:
+        verbose_name_plural = "group classes"
+
+
+class GroupStatus(models.Model):
+    name = models.CharField(max_length=50)
+    slug = models.SlugField(unique=True, )
+    description = models.TextField()
+    is_active = models.BooleanField(default=True, help_text="This status represents an active group")
+
+    def __str__(self, ):
+        active = ""
+        if not self.is_active:
+            active = " (inactive)"
+        return "%s%s" % (self.name, active, )
+
+    class Meta:
+        verbose_name_plural= "group statuses"
+
+
+class GroupFunding(models.Model):
+    name = models.CharField(max_length=50)
+    slug = models.SlugField(unique=True, )
+    contact_email = models.EmailField()
+    funding_list = models.CharField(max_length=32, blank=True, help_text="List that groups receiving funding emails should be on. The database will attempt to make sure that ONLY those groups are on it.")
+
+    def __str__(self, ):
+        return "%s (%s)" % (self.name, self.contact_email, )
+
+
 class AthenaMoiraAccount_ActiveManager(models.Manager):
     def get_query_set(self, ):