diff --git a/backend/auction/admin.py b/backend/auction/admin.py
index 21e50de..adf954c 100644
--- a/backend/auction/admin.py
+++ b/backend/auction/admin.py
@@ -44,26 +44,26 @@ class AuctionAdmin(admin.ModelAdmin):
def view_product_link(self, obj):
url = reverse("admin:auction_product_change", args=[obj.product_id])
- return format_html(f'{obj.product.name} ({obj.product_id})')
+ return format_html('{} ({})', url, obj.product.name, obj.product_id)
view_product_link.short_description = 'Товар'
def view_betters_link(self, obj):
count = obj.betters.distinct().count()
url = reverse('admin:users_tguser_changelist') + '?' + urlencode({'betters__pk': f'{obj.pk}'})
- return format_html(f' {count} users ')
+ return format_html(' {} users ', url, count)
view_betters_link.short_description = 'Пользователи, сделавшие ставки'
def view_bets_link(self, obj):
count = obj.bets.count()
url = reverse('admin:auction_bet_changelist') + '?' + urlencode({'auction_id': f'{obj.pk}'})
- return format_html(f' {count} bets ')
+ return format_html(' {} bets ', url, count)
view_bets_link.short_description = 'Ставки'
def view_winners_link(self, obj):
winning_user_ids = obj.bets.filter(_is_winning=True).values_list('user_id', flat=True)
count = winning_user_ids.count()
url = reverse('admin:users_tguser_changelist') + '?' + urlencode({'pk__in': ','.join(map(str, winning_user_ids))})
- return format_html(f' {count} победителей ')
+ return format_html(' {} победителей ', url, count)
view_winners_link.short_description = 'Победители'
@@ -86,7 +86,7 @@ class ProductAdmin(admin.ModelAdmin):
def view_auctions_link(self, obj):
count = obj.auctions.count()
url = reverse('admin:auction_auction_changelist') + '?' + urlencode({'product_id': f'{obj.pk}'})
- return format_html(f' {count} auctions ')
+ return format_html(' {} auctions ', url, count)
view_auctions_link.short_description = 'Аукционы'
@@ -132,16 +132,16 @@ class BetAdmin(admin.ModelAdmin):
def view_user_link(self, obj):
url = reverse("admin:users_tguser_change", args=[obj.user_id])
- return format_html(f'{obj.user}')
+ return format_html('{}', url, obj.user)
view_user_link.short_description = 'Пользователь'
def view_auction_link(self, obj):
url = reverse("admin:auction_auction_change", args=[obj.auction_id])
- return format_html(f'{obj.auction}')
+ return format_html('{}', url, obj.auction)
view_auction_link.short_description = 'Аукцион'
def view_transactions_link(self, obj):
count = obj.transactions.count()
url = reverse('admin:users_bettransaction_changelist') + '?' + urlencode({'bet_id': f'{obj.pk}'})
- return format_html(f' {count} transactions ')
+ return format_html(' {} transactions ', url, count)
view_transactions_link.short_description = 'Транзакции'
diff --git a/backend/clicks/admin.py b/backend/clicks/admin.py
index 4657d44..2b1add1 100644
--- a/backend/clicks/admin.py
+++ b/backend/clicks/admin.py
@@ -28,10 +28,10 @@ class ClickAdmin(admin.ModelAdmin):
def view_user_link(self, obj):
url = reverse("admin:users_tguser_change", args=[obj.user_id])
- return format_html(f'{obj.user}')
+ return format_html('{}', url, obj.user)
view_user_link.short_description = 'Пользователь'
def view_transaction_link(self, obj):
url = reverse("admin:users_clicktransaction_change", args=[obj.transaction.id])
- return format_html(f'{obj.transaction}')
+ return format_html('{}', url, obj.transaction)
view_transaction_link.short_description = 'Транзакция'
diff --git a/backend/users/admin.py b/backend/users/admin.py
index c0ec8ec..8acefbf 100644
--- a/backend/users/admin.py
+++ b/backend/users/admin.py
@@ -58,20 +58,20 @@ class TGUserAdmin(admin.ModelAdmin):
def view_user_link(self, obj):
url = reverse("admin:auth_user_change", args=[obj.user_id])
- return format_html(f'{obj.user.username} ({obj.user_id})')
+ return format_html('{} ({})', url, obj.user.username, obj.user_id)
view_user_link.short_description = 'Системный пользователь'
def view_referred_by_link(self, obj):
if not obj.referred_by:
return
url = reverse("admin:users_tguser_change", args=[obj.referred_by.tg_id])
- return format_html(f'{obj.referred_by.username} ({obj.referred_by.tg_id})')
+ return format_html('{} ({})', url, obj.referred_by.username, obj.referred_by.tg_id)
view_referred_by_link.short_description = 'Кем был приглашен'
def view_referred_users_link(self, obj):
count = obj.referrees.count()
url = reverse('admin:users_tguser_changelist') + '?' + urlencode({'referred_by__tg_id': f'{obj.tg_id}'})
- return format_html(f' {count} users ')
+ return format_html(' {} users ', url, count)
view_referred_users_link.short_description = 'Приглашенные пользователи'
def view_transactions(self, obj):
@@ -82,26 +82,25 @@ class TGUserAdmin(admin.ModelAdmin):
referral_url = reverse('admin:users_referraltransaction_changelist') + '?' + urlencode({'user_id': f'{obj.tg_id}'})
return format_html(
- f' все // '
- f' клики // '
- f' ставки // '
- f' комиссии // '
- f' реферальная программа '
+ ' все // '
+ ' клики // '
+ ' ставки // '
+ ' комиссии // '
+ ' реферальная программа ',
+ all_url, click_url, bet_url, commission_url, referral_url
)
view_transactions.short_description = 'Транзакции'
def view_clicks_link(self, obj):
count = obj.clicks.count()
url = reverse('admin:clicks_click_changelist') + '?' + urlencode({'user_id': f'{obj.tg_id}'})
- return format_html(f' {count} clicks ')
+ return format_html(' {} clicks ', url, count)
view_clicks_link.short_description = 'Клики'
@admin.action(description="Создать рассылку для выбранных пользователей")
def create_mailing_list(self, request, queryset):
request.session['user_ids'] = list(queryset.values_list('pk', flat=True))
- return HttpResponseRedirect(
- f'/admin/users/mailinglist/add/'
- )
+ return HttpResponseRedirect(reverse('admin:users_mailinglist_add'))
class MailingListAdminForm(forms.ModelForm):
@@ -162,14 +161,14 @@ class MailingListReceiverInfoAdmin(admin.ModelAdmin):
if not obj.user:
return None
link = reverse("admin:users_tguser_change", args=[obj.user.tg_id])
- return format_html(f'{obj.user}')
+ return format_html('{}', link, obj.user)
view_user_link.short_description = 'Пользователь'
def view_mailing_list_link(self, obj):
if not obj.mailing_list:
return None
link = reverse("admin:users_mailinglist_change", args=[obj.mailing_list.pk])
- return format_html(f'{obj.mailing_list}')
+ return format_html('{}', link, obj.mailing_list)
view_mailing_list_link.short_description = 'Рассылка'
@@ -205,28 +204,28 @@ class MailingListAdmin(admin.ModelAdmin):
count = obj.users.count()
url = reverse('admin:users_tguser_changelist') + '?' + urlencode(
{'mailing_lists__id': f'{obj.id}'})
- return format_html(f' {count} пользователей ')
+ return format_html(' {} пользователей ', url, count)
view_users_link.short_description = 'Пользователи'
def view_mailing_list_receiver_infos_link(self, obj):
count = obj.mailing_list_receiver_infos.count()
url = reverse('admin:users_mailinglistreceiverinfo_changelist') + '?' + urlencode(
{'mailing_list_id': f'{obj.id}'})
- return format_html(f' {count} получателей ')
+ return format_html(' {} получателей ', url, count)
view_mailing_list_receiver_infos_link.short_description = 'Информация о получателях'
def view_main_button_link(self, obj):
if not obj.main_button:
return
url = reverse("admin:misc_button_change", args=[obj.main_button_id])
- return format_html(f' Кнопка №{obj.main_button_id}')
+ return format_html(' Кнопка №{}', url, obj.main_button_id)
view_main_button_link.short_description = 'Основная кнопка'
def view_webapp_button_link(self, obj):
if not obj.webapp_button:
return
url = reverse("admin:misc_button_change", args=[obj.webapp_button_id])
- return format_html(f' Кнопка №{obj.webapp_button_id}')
+ return format_html(' Кнопка №{}', url, obj.webapp_button_id)
view_webapp_button_link.short_description = 'Кнопка, открывающая вебапп'
@@ -242,7 +241,7 @@ class TransactionChildAdmin(PolymorphicChildModelAdmin):
if not obj.user:
return
url = reverse("admin:users_tguser_change", args=[obj.user.tg_id])
- return format_html(f'{obj.user}')
+ return format_html('{}', url, obj.user)
view_user_link.short_description = 'Пользователь'
def has_delete_permission(self, request, obj=None):
@@ -269,7 +268,7 @@ class ClickTransactionAdmin(TransactionChildAdmin):
def view_click_link(self, obj):
link = reverse("admin:clicks_click_change", args=[obj.click_id])
- return format_html(f' {obj.click}')
+ return format_html(' {}', link, obj.click)
view_click_link.short_description = 'Клик'
@@ -293,7 +292,7 @@ class BetTransactionAdmin(TransactionChildAdmin):
def view_bet_link(self, obj):
link = reverse("admin:auction_bet_change", args=[obj.bet_id])
- return format_html(f'{obj.bet}')
+ return format_html('{}', link, obj.bet)
view_bet_link.short_description = 'Ставка'
def view_commission_link(self, obj):
@@ -302,7 +301,7 @@ class BetTransactionAdmin(TransactionChildAdmin):
except ObjectDoesNotExist:
return None
link = reverse("admin:users_commissiontransaction_change", args=[obj.commission.id])
- return format_html(f' {obj.commission} ')
+ return format_html(' {} ', link, obj.commission)
view_commission_link.short_description = 'Комиссия'
def view_refunded_by_link(self, obj):
@@ -311,14 +310,14 @@ class BetTransactionAdmin(TransactionChildAdmin):
except ObjectDoesNotExist:
return None
link = reverse("admin:users_bettransaction_change", args=[obj.refunded_by.id])
- return format_html(f' {obj.refunded_by} ')
+ return format_html(' {} ', link, obj.refunded_by)
view_refunded_by_link.short_description = 'Чем компенсирована'
def view_refund_to_link(self, obj):
if not obj.refund_to:
return None
link = reverse("admin:users_bettransaction_change", args=[obj.refund_to_id])
- return format_html(f' {obj.refund_to} ')
+ return format_html(' {} ', link, obj.refund_to)
view_refund_to_link.short_description = 'Что компенсирует'
@@ -339,7 +338,7 @@ class CommissionTransactionAdmin(TransactionChildAdmin):
def view_bet_transaction_link(self, obj):
link = reverse("admin:users_bettransaction_change", args=[obj.parent_transaction])
- return format_html(f' {obj.parent_transaction} ')
+ return format_html(' {} ', link, obj.parent_transaction)
view_bet_transaction_link.short_description = 'Родительская транзакция'
@@ -389,7 +388,7 @@ class TransactionParentAdmin(PolymorphicParentModelAdmin):
if not obj.user:
return
url = reverse("admin:users_tguser_change", args=[obj.user.tg_id])
- return format_html(f'{obj.user}')
+ return format_html('{}', url, obj.user)
view_user_link.short_description = 'Пользователь'
def view_type(self, obj):