px
All checks were successful
Deploy to Server / deploy (push) Successful in 24s

This commit is contained in:
jeremygan2021
2026-02-25 01:28:08 +08:00
parent 8298eb6add
commit cf063707a3
4 changed files with 34 additions and 26 deletions

View File

@@ -202,16 +202,17 @@ class TopicAdmin(OrderableAdminMixin, ModelAdmin):
inlines = [TopicMediaInline, ReplyInline]
actions = ['reset_ordering']
@admin.action(description="重置排序 (按发布时间倒序)")
@admin.action(description="重置排序 (0,1,2... 新帖子在前)")
def reset_ordering(self, request, queryset):
"""
将所有帖子按时间倒序重新分配order值order = -id
将所有帖子按时间倒序重新分配order值 (0, 1, 2, ...)
"""
all_objects = Topic.objects.all().order_by('-id')
for obj in all_objects:
obj.order = -obj.id
obj.save(update_fields=['order'])
self.message_user(request, f"成功重置了 {all_objects.count()} 个帖子的排序权重(新帖子在前)。")
all_objects = Topic.objects.all().order_by('-created_at')
for index, obj in enumerate(all_objects):
if obj.order != index:
obj.order = index
obj.save(update_fields=['order'])
self.message_user(request, f"成功重置了 {all_objects.count()} 个帖子的排序权重从0开始")
fieldsets = (
('帖子内容', {

View File

@@ -142,12 +142,19 @@ class Topic(models.Model):
order = models.IntegerField(default=0, verbose_name="排序")
def save(self, *args, **kwargs):
# 记录是否为新对象因为super().save后pk就有了
is_new = self.pk is None
# 第一次保存,先入库
super().save(*args, **kwargs)
# 如果是新创建,且 order 默认为 0未指定
if is_new and getattr(self, 'order', 0) == 0:
# 默认使用 -id 作为排序值确保新帖子默认排在前面order越小越靠前
Topic.objects.filter(pk=self.pk).update(order=-self.pk)
self.order = -self.pk
# 将所有其他帖子的 order + 1腾出 0 的位置
Topic.objects.exclude(pk=self.pk).filter(order__gte=0).update(order=models.F('order') + 1)
# 确保自己是 0
Topic.objects.filter(pk=self.pk).update(order=0)
self.order = 0
def __str__(self):
return self.title

View File

@@ -259,8 +259,8 @@ class TopicViewSet(viewsets.ModelViewSet):
filter_backends = [filters.SearchFilter, filters.OrderingFilter, DjangoFilterBackend]
search_fields = ['title', 'content']
filterset_fields = ['category', 'is_pinned']
ordering_fields = ['created_at', 'view_count']
ordering = ['-is_pinned', '-created_at']
ordering_fields = ['created_at', 'view_count', 'order']
ordering = ['order', '-is_pinned', '-created_at']
def perform_create(self, serializer):
user = get_current_wechat_user(self.request)

View File

@@ -101,19 +101,7 @@ DATABASES = {
#从环境变量获取数据库配置 (Docker 环境会自动注入这些变量。
DB_HOST = os.environ.get('DB_HOST', '6.6.6.66')
if DB_HOST:
DATABASES['default'] = {
'ENGINE': 'django.db.backends.postgresql',
'NAME': os.environ.get('DB_NAME', 'market'),
'USER': os.environ.get('DB_USER', 'market'),
'PASSWORD': os.environ.get('DB_PASSWORD', '123market'),
'HOST': DB_HOST,
'PORT': os.environ.get('DB_PORT', '5432'),
}
# DB_HOST = os.environ.get('DB_HOST', '121.43.104.161')
# DB_HOST = os.environ.get('DB_HOST', '6.6.6.66')
# if DB_HOST:
# DATABASES['default'] = {
# 'ENGINE': 'django.db.backends.postgresql',
@@ -121,10 +109,22 @@ if DB_HOST:
# 'USER': os.environ.get('DB_USER', 'market'),
# 'PASSWORD': os.environ.get('DB_PASSWORD', '123market'),
# 'HOST': DB_HOST,
# 'PORT': os.environ.get('DB_PORT', '6433'),
# 'PORT': os.environ.get('DB_PORT', '5432'),
# }
DB_HOST = os.environ.get('DB_HOST', '121.43.104.161')
if DB_HOST:
DATABASES['default'] = {
'ENGINE': 'django.db.backends.postgresql',
'NAME': os.environ.get('DB_NAME', 'market'),
'USER': os.environ.get('DB_USER', 'market'),
'PASSWORD': os.environ.get('DB_PASSWORD', '123market'),
'HOST': DB_HOST,
'PORT': os.environ.get('DB_PORT', '6433'),
}
# Password validation
# https://docs.djangoproject.com/en/6.0/ref/settings/#auth-password-validators