Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Usage requirements refactor #749

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
452 changes: 226 additions & 226 deletions src/checkin/views.py

Large diffs are not rendered by default.

97 changes: 48 additions & 49 deletions src/groups/admin.py
Original file line number Diff line number Diff line change
@@ -1,49 +1,48 @@
from django.contrib import admin
from simple_history.admin import SimpleHistoryAdmin

from util.admin_utils import DefaultAdminWidgetsMixin
from .models import Committee, InheritanceGroup


class InheritanceGroupAdmin(SimpleHistoryAdmin):
list_display = ('name', 'last_modified')

fieldsets = (
(None, {
'fields': ('name', 'parents', 'own_permissions'),
}),
('Inherited permissions', {
'description': """
Permissions inherited from parent groups, not including those that overlap
with this group's own permissions.
""",
'classes': ('collapse',),
'fields': ('get_inherited_permissions',),
}),
(None, {
'fields': ('last_modified',),
}),
)
filter_horizontal = ('parents', 'own_permissions')
readonly_fields = ('last_modified', 'get_inherited_permissions',)

@admin.display(description="Inherited permissions")
def get_inherited_permissions(self, inheritance_group: InheritanceGroup):
return "\n".join(map(str, inheritance_group.inherited_permissions))

def get_form(self, request, obj: InheritanceGroup = None, **kwargs):
form = super().get_form(request, obj, **kwargs)
if obj:
form.base_fields['parents'].queryset = obj.get_available_parents()
return form


class CommitteeAdmin(DefaultAdminWidgetsMixin, SimpleHistoryAdmin):
list_display = ('name', 'last_modified')
list_select_related = ('group',)

readonly_fields = ('last_modified',)


admin.site.register(InheritanceGroup, InheritanceGroupAdmin)
admin.site.register(Committee, CommitteeAdmin)
from django.contrib import admin
from simple_history.admin import SimpleHistoryAdmin

from util.admin_utils import DefaultAdminWidgetsMixin
from .models import Committee, InheritanceGroup


class InheritanceGroupAdmin(SimpleHistoryAdmin):
list_display = ('name', 'last_modified')

fieldsets = (
(None, {
'fields': ('name', 'parents', 'own_permissions'),
}),
('Inherited permissions', {
'description': """
Permissions inherited from parent groups, not including those that overlap
with this group's own permissions.
""",
'classes': ('collapse',),
'fields': ('get_inherited_permissions',),
}),
(None, {
'fields': ('last_modified',),
}),
)
filter_horizontal = ('parents', 'own_permissions')
readonly_fields = ('last_modified', 'get_inherited_permissions',)

@admin.display(description="Inherited permissions")
def get_inherited_permissions(self, inheritance_group: InheritanceGroup):
return "\n".join(map(str, inheritance_group.inherited_permissions))

def get_form(self, request, obj: InheritanceGroup = None, **kwargs):
form = super().get_form(request, obj, **kwargs)
if obj:
form.base_fields['parents'].queryset = obj.get_available_parents()
return form


class CommitteeAdmin(DefaultAdminWidgetsMixin, SimpleHistoryAdmin):
list_display = ('name', 'last_modified')
list_select_related = ('group',)

readonly_fields = ('last_modified',)

admin.site.register(InheritanceGroup, InheritanceGroupAdmin)
admin.site.register(Committee, CommitteeAdmin)
Binary file modified src/locale/nb/LC_MESSAGES/django.mo
Binary file not shown.
Loading
Loading