Skip to content

Revert "Black format I believe" #608

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.

Sign up for GitHub

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

Merged
krestenlaust merged 1 commit into from
Jan 9, 2026
Merged

Revert "Black format I believe" #608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
174 changes: 69 additions & 105 deletions stregsystem/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ def refund(modeladmin, request, queryset):


class SaleAdmin(admin.ModelAdmin):
list_filter = ("room", "timestamp")
list_filter = ('room', 'timestamp')
list_display = (
"get_username",
"get_fullname",
"get_product_name",
"get_room_name",
"timestamp",
"get_price_display",
'get_username',
'get_fullname',
'get_product_name',
'get_room_name',
'timestamp',
'get_price_display',
)
actions = [refund]
search_fields = ["^member__username", "=product__id", "product__name"]
valid_lookups = "member"
autocomplete_fields = ["member", "product"]
search_fields = ['^member__username', '=product__id', 'product__name']
valid_lookups = 'member'
autocomplete_fields = ['member', 'product']

class Media:
css = {"all": ("stregsystem/select2-stregsystem.css",)}
css = {'all': ('stregsystem/select2-stregsystem.css',)}

def get_username(self, obj):
return obj.member.username
Expand Down Expand Up @@ -113,32 +113,32 @@ def toggle_active_selected_products(modeladmin, request, queryset):


class ProductActivatedListFilter(admin.SimpleListFilter):
title = "activated"
parameter_name = "activated"
title = 'activated'
parameter_name = 'activated'

def lookups(self, request, model_admin):
return (
("Yes", "Yes"),
("No", "No"),
('Yes', 'Yes'),
('No', 'No'),
)

def queryset(self, request, queryset):
if self.value() == "Yes":
if self.value() == 'Yes':
return make_active_productlist_query(queryset)
elif self.value() == "No":
elif self.value() == 'No':
return make_inactive_productlist_query(queryset)
else:
return queryset


class ProductAdmin(admin.ModelAdmin):
search_fields = ("name", "price", "id")
list_filter = (ProductActivatedListFilter, "deactivate_date", "price")
search_fields = ('name', 'price', 'id')
list_filter = (ProductActivatedListFilter, 'deactivate_date', 'price')
list_display = (
"activated",
"id",
"name",
"get_price_display",
'activated',
'id',
'name',
'get_price_display',
)
fields = (
"name",
Expand All @@ -153,7 +153,7 @@ class ProductAdmin(admin.ModelAdmin):
readonly_fields = ("get_bought",)

actions = [toggle_active_selected_products]
filter_horizontal = ("categories", "rooms")
filter_horizontal = ('categories', 'rooms')

def get_price_display(self, obj):
if obj.price is None:
Expand All @@ -177,24 +177,24 @@ def activated(self, product):

class NamedProductAdmin(admin.ModelAdmin):
search_fields = (
"name",
"product",
'name',
'product',
)
list_display = (
"name",
"product",
'name',
'product',
)
fields = (
"name",
"product",
'name',
'product',
)
autocomplete_fields = [
"product",
'product',
]


class CategoryAdmin(admin.ModelAdmin):
list_display = ("name", "items_in_category")
list_display = ('name', 'items_in_category')

def items_in_category(self, obj):
return obj.product_set.count()
Expand All @@ -215,49 +215,33 @@ def clean_username(self):

class MemberAdmin(admin.ModelAdmin):
form = MemberForm
list_filter = ("want_spam",)
search_fields = ("username", "firstname", "lastname", "email")
list_display = ("username", "firstname", "lastname", "balance", "email", "notes")
list_filter = ('want_spam',)
search_fields = ('username', 'firstname', 'lastname', 'email')
list_display = ('username', 'firstname', 'lastname', 'balance', 'email', 'notes')

# fieldsets is like fields, except that they are grouped and with descriptions
fieldsets = (
(
None,
{
"fields": (
"username",
"firstname",
"lastname",
"year",
"gender",
"email",
),
"description": "Basal information omkring fember",
'fields': ('username', 'firstname', 'lastname', 'year', 'gender', 'email'),
'description': "Basal information omkring fember",
},
),
(
None,
{"fields": ("notes",), "description": "Studieretning + evt. andet i noter"},
),
(None, {'fields': ('notes',), 'description': "Studieretning + evt. andet i noter"}),
(
None,
{
"fields": (
"active",
"want_spam",
"signup_due_paid",
"balance",
"undo_count",
),
"description": "Lad være med at rode med disse, med mindre du ved hvad du laver ...",
'fields': ('active', 'want_spam', 'signup_due_paid', 'balance', 'undo_count'),
'description': "Lad være med at rode med disse, med mindre du ved hvad du laver ...",
},
),
)

def save_model(self, request, obj, form, change):
if "username" in form.changed_data and change:
if 'username' in form.changed_data and change:
if Member.objects.filter(username__iexact=obj.username).exclude(pk=obj.pk).exists():
messages.add_message(request, messages.WARNING, "Det brugernavn var allerede optaget")
messages.add_message(request, messages.WARNING, 'Det brugernavn var allerede optaget')
super().save_model(request, obj, form, change)

def autocomplete_view(self, request):
Expand All @@ -274,22 +258,17 @@ class AutoCompleteJsonViewCorrector(AutocompleteJsonView):

def get_queryset(self):
qs = super().get_queryset()
return qs.filter(active=True).order_by("username")
return qs.filter(active=True).order_by('username')


class PaymentAdmin(admin.ModelAdmin):
list_display = (
"get_username",
"timestamp",
"get_amount_display",
"is_mobilepayment",
)
valid_lookups = "member"
search_fields = ["member__username"]
autocomplete_fields = ["member"]
list_display = ('get_username', 'timestamp', 'get_amount_display', 'is_mobilepayment')
valid_lookups = 'member'
search_fields = ['member__username']
autocomplete_fields = ['member']

class Media:
css = {"all": ("stregsystem/select2-stregsystem.css",)}
css = {'all': ('stregsystem/select2-stregsystem.css',)}

def get_username(self, obj):
return obj.member.username
Expand All @@ -313,20 +292,20 @@ def is_mobilepayment(self, obj):

class MobilePaymentAdmin(admin.ModelAdmin):
list_display = (
"payment",
"customer_name",
"comment",
"timestamp",
"transaction_id",
"get_amount_display",
"status",
'payment',
'customer_name',
'comment',
'timestamp',
'transaction_id',
'get_amount_display',
'status',
)
valid_lookups = "member"
search_fields = ["member__username"]
autocomplete_fields = ["member", "payment"]
valid_lookups = 'member'
search_fields = ['member__username']
autocomplete_fields = ['member', 'payment']

class Media:
css = {"all": ("stregsystem/select2-stregsystem.css",)}
css = {'all': ('stregsystem/select2-stregsystem.css',)}

def get_amount_display(self, obj):
return money(obj.amount)
Expand All @@ -335,11 +314,11 @@ def get_amount_display(self, obj):
get_amount_display.admin_order_field = "amount"

# django-bug, .delete() is not called https://stackoverflow.com/questions/1471909/django-model-delete-not-triggered
actions = ["really_delete_selected"]
actions = ['really_delete_selected']

def get_actions(self, request):
actions = super(MobilePaymentAdmin, self).get_actions(request)
del actions["delete_selected"]
del actions['delete_selected']
return actions

def really_delete_selected(self, _, queryset):
Expand All @@ -350,18 +329,10 @@ def really_delete_selected(self, _, queryset):


class LogEntryAdmin(admin.ModelAdmin):
date_hierarchy = "action_time"
list_filter = ["content_type", "action_flag"]
search_fields = ["object_repr", "change_message", "user__username"]
list_display = [
"action_time",
"user",
"content_type",
"object_id",
"action_flag",
"change_message",
"object_repr",
]
date_hierarchy = 'action_time'
list_filter = ['content_type', 'action_flag']
search_fields = ['object_repr', 'change_message', 'user__username']
list_display = ['action_time', 'user', 'content_type', 'object_id', 'action_flag', 'change_message', 'object_repr']

def has_view_permission(self, request, obj=None):
return request.user.is_superuser
Expand All @@ -377,14 +348,7 @@ def has_delete_permission(self, request, obj=None):


class ThemeAdmin(admin.ModelAdmin):
list_display = [
"name",
"override",
"begin_month",
"begin_day",
"end_month",
"end_day",
]
list_display = ["name", "override", "begin_month", "begin_day", "end_month", "end_day"]
search_fields = ["name"]

@admin.action(description="Do not force chosen themes")
Expand All @@ -403,10 +367,10 @@ def force_hide(modeladmin, request, queryset):


class ProductNoteAdmin(admin.ModelAdmin):
search_fields = ("active", "text")
search_fields = ('active', 'text')
list_display = (
"active",
"text",
'active',
'text',
)

actions = [toggle_active_selected_products]
Expand Down