diff --git a/greenmine/base/admin.py b/greenmine/base/admin.py index e0e734c3..109551f1 100644 --- a/greenmine/base/admin.py +++ b/greenmine/base/admin.py @@ -1,7 +1,7 @@ from django.utils.translation import ugettext_lazy as _ from django.contrib import admin -from django.contrib.auth.models import Group +from django.contrib.auth.models import Group, Permission from django.contrib.auth.admin import UserAdmin as DjangoUserAdmin from greenmine.base.models import Role, User @@ -35,4 +35,11 @@ class UserAdmin(DjangoUserAdmin): form = UserChangeForm add_form = UserCreationForm + +class PermissionAdmin(admin.ModelAdmin): + list_display = ['name', 'content_type', 'codename'] + list_filter = ['content_type'] + + admin.site.register(User, UserAdmin) +admin.site.register(Permission, PermissionAdmin) diff --git a/greenmine/scrum/admin.py b/greenmine/scrum/admin.py index 0db41896..5353d6ff 100644 --- a/greenmine/scrum/admin.py +++ b/greenmine/scrum/admin.py @@ -70,11 +70,13 @@ class TaskAdmin(reversion.VersionAdmin): def user_story_id(self, instance): return instance.user_story.id +class MembershipAdmin(admin.ModelAdmin): + list_display = ['project', 'role', 'user'] + list_filter = ['project', 'role'] class IssueAdmin(reversion.VersionAdmin): list_display = ["subject", "type"] - class SeverityAdmin(admin.ModelAdmin): list_display = ["name", "order", "project"] @@ -106,4 +108,5 @@ admin.site.register(models.UserStoryStatus, UserStoryStatusAdmin) admin.site.register(models.Priority, PriorityAdmin) admin.site.register(models.IssueType, IssueTypeAdmin) admin.site.register(models.Points, PointsAdmin) +admin.site.register(models.Membership, MembershipAdmin)