diff --git a/inventory/templates/inventory/sale_form.html b/inventory/templates/inventory/sale_form.html index 5675f91..4142516 100644 --- a/inventory/templates/inventory/sale_form.html +++ b/inventory/templates/inventory/sale_form.html @@ -1346,10 +1346,6 @@
{% if request.LANGUAGE_CODE == 'en' %}Payment Met {% if request.LANGUAGE_CODE == 'en' %}Balance{% else %}余额{% endif %} - diff --git a/inventory/templates/inventory/sale_item_form.html b/inventory/templates/inventory/sale_item_form.html index 6193151..f3c72c5 100644 --- a/inventory/templates/inventory/sale_item_form.html +++ b/inventory/templates/inventory/sale_item_form.html @@ -476,16 +476,19 @@

添加销售商品

- {% for item in sale.saleitems.all %} + {% for item in items %} {{ item.product.name }} {{ item.quantity }} {{ item.actual_price }} {{ item.subtotal }} - - - +
+ {% csrf_token %} + +
{% endfor %} diff --git a/inventory/templates/inventory/system/delete_backup.html b/inventory/templates/inventory/system/delete_backup.html new file mode 100644 index 0000000..9ae08c9 --- /dev/null +++ b/inventory/templates/inventory/system/delete_backup.html @@ -0,0 +1,40 @@ +{% extends 'inventory/base.html' %} + +{% block title %}删除备份 - {{ block.super }}{% endblock %} + +{% block content %} +
+
+
+
+
+ 删除备份 +
+
+
+

确定要删除备份 {{ backup_name }} 吗？

+

此操作不可恢复。

+ +
+ {% csrf_token %} +
+ + +
+ +
+ + 返回 + + +
+
+
+
+
+
+{% endblock %} diff --git a/inventory/tests/test_sale_status.py b/inventory/tests/test_sale_status.py index 270e7a3..8f431d5 100644 --- a/inventory/tests/test_sale_status.py +++ b/inventory/tests/test_sale_status.py @@ -141,6 +141,19 @@ def test_cannot_delete_item_from_cancelled_sale(self): self.inventory.refresh_from_db() self.assertEqual(self.inventory.quantity, restored_quantity) + def test_get_does_not_delete_sale_item(self): + sale = self._make_sale(status='DRAFT') + item = sale.items.get() + self.inventory.refresh_from_db() + quantity_before = self.inventory.quantity + + response = self.client.get(reverse('sale_item_delete', args=[sale.id, item.id])) + + self.assertRedirects(response, reverse('sale_item_create', args=[sale.id])) + self.assertTrue(SaleItem.objects.filter(pk=item.pk).exists()) + self.inventory.refresh_from_db() + self.assertEqual(self.inventory.quantity, quantity_before) + def test_delete_item_persists_recalculated_total(self): sale = self._make_sale(status='DRAFT') extra = SaleItem.objects.create( @@ -160,6 +173,21 @@ def test_delete_item_persists_recalculated_total(self): sale.refresh_from_db() self.assertEqual(sale.total_amount, Decimal('20.00')) # 删除后总额已落库 + def test_sale_detail_get_does_not_rewrite_persisted_amounts(self): + sale = self._make_sale(status='COMPLETED') + Sale.objects.filter(pk=sale.pk).update( + total_amount=Decimal('5.00'), + discount_amount=Decimal('0.00'), + final_amount=Decimal('5.00'), + ) + + response = self.client.get(reverse('sale_detail', args=[sale.id])) + + self.assertEqual(response.status_code, 200) + sale.refresh_from_db() + self.assertEqual(sale.total_amount, Decimal('5.00')) + self.assertEqual(sale.final_amount, Decimal('5.00')) + def test_sale_complete_page_renders_for_draft_sale(self): sale = self._make_sale(status='DRAFT') @@ -203,3 +231,19 @@ def test_sale_complete_insufficient_balance_does_not_credit_member(self): self.assertEqual(member.purchase_count, 0) self.assertEqual(member.total_spend, Decimal('0.00')) self.assertFalse(MemberTransaction.objects.filter(member=member).exists()) + + def test_sale_complete_rejects_unsupported_payment_method(self): + sale = self._make_sale(status='DRAFT') + + response = self.client.post( + reverse('sale_complete', args=[sale.id]), + { + 'payment_method': 'credit', + 'remark': 'unsupported credit payment', + }, + ) + + self.assertRedirects(response, reverse('sale_complete', args=[sale.id])) + sale.refresh_from_db() + self.assertEqual(sale.status, 'DRAFT') + self.assertEqual(sale.payment_method, 'cash') diff --git a/inventory/tests/test_sales_balance_payment.py b/inventory/tests/test_sales_balance_payment.py index ab5edc8..116bc69 100644 --- a/inventory/tests/test_sales_balance_payment.py +++ b/inventory/tests/test_sales_balance_payment.py @@ -97,3 +97,13 @@ def test_sale_create_balance_payment_rolls_back_when_balance_is_insufficient(sel self.assertEqual(self.member.balance, Decimal('5.00')) self.inventory.refresh_from_db() self.assertEqual(self.inventory.quantity, 10) + + def test_sale_create_rejects_unsupported_credit_payment(self): + response = self.client.post(reverse('sale_create'), self.sale_post_data('credit')) + + self.assertRedirects(response, reverse('sale_create')) + self.assertFalse(Sale.objects.exists()) + self.inventory.refresh_from_db() + self.assertEqual(self.inventory.quantity, 10) + self.member.refresh_from_db() + self.assertEqual(self.member.balance, Decimal('100.00')) diff --git a/inventory/tests/test_views.py b/inventory/tests/test_views.py index 5ed657d..54ea488 100644 --- a/inventory/tests/test_views.py +++ b/inventory/tests/test_views.py @@ -1,7 +1,9 @@ import json import os import tempfile +from unittest import mock +from django.contrib.admin.models import LogEntry from django.core import management from django.test import TestCase, Client from django.urls import reverse @@ -255,8 +257,10 @@ def setUp(self): self.addCleanup(self.temp_parent.cleanup) self.backup_root = os.path.join(self.temp_parent.name, 'backups') self.temp_dir = os.path.join(self.temp_parent.name, 'temp') + self.media_root = os.path.join(self.temp_parent.name, 'media') os.makedirs(self.backup_root, exist_ok=True) os.makedirs(self.temp_dir, exist_ok=True) + os.makedirs(self.media_root, exist_ok=True) def test_delete_backup_rejects_parent_directory_traversal(self): sentinel_path = os.path.join(self.temp_parent.name, 'keep.txt') @@ -321,3 +325,201 @@ def test_restore_backup_flushes_records_missing_from_snapshot(self): self.assertEqual(response.status_code, 302) self.assertEqual(response['Location'], reverse('system_settings')) self.assertFalse(Product.objects.filter(pk=product.pk).exists()) + + def test_restore_backup_accepts_template_confirm_field(self): + backup_name = 'template-confirm' + backup_dir = os.path.join(self.backup_root, backup_name) + os.makedirs(backup_dir, exist_ok=True) + db_file = os.path.join(backup_dir, 'db.json') + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir, MEDIA_ROOT=self.media_root): + management.call_command( + 'dumpdata', + '--exclude', + 'auth.permission', + '--exclude', + 'contenttypes', + '--exclude', + 'sessions.session', + '--indent', + '4', + '--output', + db_file, + verbosity=0, + ) + + with open(os.path.join(backup_dir, 'backup_info.json'), 'w', encoding='utf-8') as backup_info: + json.dump( + { + 'name': backup_name, + 'created_at': '2026-05-30T11:00:00', + 'created_by': self.user.username, + 'includes_media': False, + }, + backup_info, + ) + + category = Category.objects.create(name='模板确认后分类') + product = Product.objects.create( + barcode='template-confirm-product', + name='模板确认后商品', + category=category, + price=Decimal('10.00'), + cost=Decimal('5.00'), + ) + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir, MEDIA_ROOT=self.media_root): + response = self.client.post( + reverse('restore_backup', args=[backup_name]), + {'confirm_restore': 'on'}, + ) + + self.assertEqual(response.status_code, 302) + self.assertFalse(Product.objects.filter(pk=product.pk).exists()) + + def test_restore_backup_page_renders_template_context(self): + backup_name = 'renderable' + backup_dir = os.path.join(self.backup_root, backup_name) + os.makedirs(backup_dir, exist_ok=True) + with open(os.path.join(backup_dir, 'backup_info.json'), 'w', encoding='utf-8') as backup_info: + json.dump( + { + 'name': backup_name, + 'created_at': '2026-05-30T11:00:00', + 'created_by': self.user.username, + 'includes_media': False, + }, + backup_info, + ) + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir, MEDIA_ROOT=self.media_root): + response = self.client.get(reverse('restore_backup', args=[backup_name])) + + self.assertEqual(response.status_code, 200) + self.assertTemplateUsed(response, 'inventory/system/restore_backup.html') + self.assertContains(response, backup_name) + + def test_delete_backup_confirmation_page_renders(self): + backup_name = 'delete-renderable' + os.makedirs(os.path.join(self.backup_root, backup_name), exist_ok=True) + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir): + response = self.client.get(reverse('delete_backup', args=[backup_name])) + + self.assertEqual(response.status_code, 200) + self.assertTemplateUsed(response, 'inventory/system/delete_backup.html') + self.assertContains(response, backup_name) + + def test_restore_backup_rolls_back_database_and_media_when_media_replace_fails(self): + backup_name = 'media-rollback' + backup_dir = os.path.join(self.backup_root, backup_name) + backup_media_dir = os.path.join(backup_dir, 'media') + os.makedirs(backup_media_dir, exist_ok=True) + db_file = os.path.join(backup_dir, 'db.json') + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir, MEDIA_ROOT=self.media_root): + management.call_command( + 'dumpdata', + '--exclude', + 'auth.permission', + '--exclude', + 'contenttypes', + '--exclude', + 'sessions.session', + '--indent', + '4', + '--output', + db_file, + verbosity=0, + ) + + with open(os.path.join(backup_media_dir, 'backup-file.txt'), 'w', encoding='utf-8') as media_file: + media_file.write('backup media') + with open(os.path.join(backup_dir, 'backup_info.json'), 'w', encoding='utf-8') as backup_info: + json.dump( + { + 'name': backup_name, + 'created_at': '2026-05-30T11:00:00', + 'created_by': self.user.username, + 'includes_media': True, + }, + backup_info, + ) + + category = Category.objects.create(name='恢复失败后应保留分类') + product = Product.objects.create( + barcode='media-rollback-product', + name='恢复失败后应保留商品', + category=category, + price=Decimal('10.00'), + cost=Decimal('5.00'), + ) + current_media_file = os.path.join(self.media_root, 'current-file.txt') + with open(current_media_file, 'w', encoding='utf-8') as media_file: + media_file.write('current media') + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir, MEDIA_ROOT=self.media_root): + with mock.patch( + 'inventory.views.system.backup.replace_media_root', + side_effect=RuntimeError('media copy failed'), + ): + response = self.client.post( + reverse('restore_backup', args=[backup_name]), + {'confirm_restore': 'on', 'restore_media': 'on'}, + ) + + self.assertEqual(response.status_code, 200) + self.assertTrue(Product.objects.filter(pk=product.pk).exists()) + self.assertTrue(os.path.exists(current_media_file)) + + +class LogFileViewTest(TestCase): + def setUp(self): + self.client = Client() + self.user = User.objects.create_superuser( + username='log-admin', + password='log-pass', + email='log@example.com', + ) + self.client.force_login(self.user) + self.log_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'logs') + os.makedirs(self.log_dir, exist_ok=True) + self.addCleanup(self._cleanup_logs) + + def _cleanup_logs(self): + for file_name in ('download-test.log', 'delete-test.log'): + file_path = os.path.join(self.log_dir, file_name) + if os.path.exists(file_path): + os.remove(file_path) + + def test_download_log_file_uses_nullable_content_type(self): + file_name = 'download-test.log' + with open(os.path.join(self.log_dir, file_name), 'w', encoding='utf-8') as log_file: + log_file.write('download me') + + response = self.client.get(reverse('download_log_file', args=[file_name])) + + self.assertEqual(response.status_code, 200) + self.assertTrue( + LogEntry.objects.filter( + object_id=file_name, + content_type__isnull=True, + ).exists() + ) + + def test_delete_log_file_uses_nullable_content_type(self): + file_name = 'delete-test.log' + file_path = os.path.join(self.log_dir, file_name) + with open(file_path, 'w', encoding='utf-8') as log_file: + log_file.write('delete me') + + response = self.client.post(reverse('delete_log_file', args=[file_name]), {'confirm': 'on'}) + + self.assertRedirects(response, reverse('log_list')) + self.assertFalse(os.path.exists(file_path)) + self.assertTrue( + LogEntry.objects.filter( + object_id=file_name, + content_type__isnull=True, + ).exists() + ) diff --git a/inventory/views/sales.py b/inventory/views/sales.py index 0fc02a4..f606da3 100644 --- a/inventory/views/sales.py +++ b/inventory/views/sales.py @@ -19,6 +19,22 @@ from inventory.services import member_service from inventory.utils.query_utils import paginate_queryset + +def normalize_payment_method(payment_method, *, allow_mixed=True): + """Normalize legacy payment names and reject methods not implemented by Sale.""" + normalized = payment_method or 'cash' + if normalized == 'account': + normalized = 'balance' + + allowed_methods = {method for method, _label in Sale.PAYMENT_METHODS} + if not allow_mixed: + allowed_methods.discard('mixed') + + if normalized not in allowed_methods: + raise ValueError('不支持的支付方式') + return normalized + + @login_required def sale_list(request): """销售单列表视图""" @@ -80,31 +96,6 @@ def sale_detail(request, sale_id): sale = get_object_or_404(Sale, pk=sale_id) items = SaleItem.objects.filter(sale=sale).select_related('product') - # 确保销售单金额与商品项总和一致 - items_total = sum(item.subtotal for item in items) - if items_total > 0 and (sale.total_amount == 0 or abs(sale.total_amount - items_total) > 1): - print(f"警告: 销售单金额({sale.total_amount})与商品项总和({items_total})不一致，正在修复") - # 更新销售单金额 - discount_rate = Decimal('1.0') - if sale.member and sale.member.level and sale.member.level.discount: - try: - discount_rate = Decimal(str(sale.member.level.discount)) - except: - discount_rate = Decimal('1.0') - - discount_amount = items_total * (Decimal('1.0') - discount_rate) - final_amount = items_total - discount_amount - - # 使用原始SQL直接更新数据库 - with connection.cursor() as cursor: - cursor.execute( - "UPDATE inventory_sale SET total_amount = %s, discount_amount = %s, final_amount = %s WHERE id = %s", - [items_total, discount_amount, final_amount, sale.id] - ) - - # 重新加载销售单数据 - sale = get_object_or_404(Sale, pk=sale_id) - context = { 'sale': sale, 'items': items, @@ -331,11 +322,9 @@ def sale_create(request): # 最终安全检查，确保总金额大于0 if total_amount <= 0 and valid_products_data: - print("警告：计算的总金额仍然为0或负数，使用固定价格作为最后的保障") - # 使用855.33作为固定价格，这只是一个保底措施 - total_amount = Decimal('855.33') - discount_amount = Decimal('0.00') - final_amount = total_amount + print("错误：计算的总金额仍然为0或负数，中止创建销售单") + messages.error(request, '销售单创建失败，商品金额无效。') + return redirect('sale_create') form = SaleForm(request.POST) if form.is_valid(): @@ -358,10 +347,14 @@ def sale_create(request): pass # 设置支付方式。旧前端曾提交 account，后端统一按账户余额处理。 - payment_method = request.POST.get('payment_method', 'cash') - if payment_method == 'account': - payment_method = 'balance' - sale.payment_method = payment_method + try: + sale.payment_method = normalize_payment_method( + request.POST.get('payment_method', 'cash'), + allow_mixed=False, + ) + except ValueError as e: + messages.error(request, str(e)) + return redirect('sale_create') # 收银台是一次性下单并结算，直接标记为已完成 sale.status = 'COMPLETED' @@ -646,9 +639,9 @@ def sale_complete(request, sale_id): sale.final_amount = sale.total_amount - sale.discount_amount sale.points_earned = int(sale.final_amount) - payment_method = request.POST.get('payment_method') or sale.payment_method - if payment_method == 'account': - payment_method = 'balance' + payment_method = normalize_payment_method( + request.POST.get('payment_method') or sale.payment_method + ) sale.payment_method = payment_method balance_amount = Decimal('0.00') @@ -782,40 +775,56 @@ def sale_cancel(request, sale_id): def sale_delete_item(request, sale_id, item_id): """删除销售单商品视图""" sale = get_object_or_404(Sale, id=sale_id) - item = get_object_or_404(SaleItem, id=item_id, sale=sale) - - # 检查销售单状态 - if sale.status != 'DRAFT': - messages.error(request, '只有未完成的销售单可以修改商品') - return redirect('sale_detail', sale_id=sale.id) - - # 恢复库存 - inventory = Inventory.objects.get(product=item.product) - inventory.quantity += item.quantity - inventory.save() - - # 创建入库交易记录 - InventoryTransaction.objects.create( - product=item.product, - transaction_type='IN', - quantity=item.quantity, - operator=request.user, - notes=f'从销售单 #{sale.id} 中删除商品，恢复库存' - ) - - # 记录操作日志 - OperationLog.objects.create( - operator=request.user, - operation_type='SALE', - details=f'从销售单 #{sale.id} 中删除商品 {item.product.name}', - related_object_id=sale.id, - related_content_type=ContentType.objects.get_for_model(Sale) - ) - - # 删除商品并更新销售单总额 - item.delete() - sale.update_total_amount() - sale.save() + if request.method != 'POST': + messages.error(request, '删除销售商品需要提交确认') + return redirect('sale_item_create', sale_id=sale.id) + + try: + with transaction.atomic(): + sale = Sale.objects.select_for_update().get(id=sale_id) + item = SaleItem.objects.select_for_update().select_related('product').get( + id=item_id, + sale=sale, + ) + + # 检查销售单状态 + if sale.status != 'DRAFT': + messages.error(request, '只有未完成的销售单可以修改商品') + return redirect('sale_detail', sale_id=sale.id) + + # 恢复库存 + inventory = Inventory.objects.select_for_update().get(product=item.product) + inventory.quantity += item.quantity + inventory.save() + + # 创建入库交易记录 + InventoryTransaction.objects.create( + product=item.product, + transaction_type='IN', + quantity=item.quantity, + operator=request.user, + notes=f'从销售单 #{sale.id} 中删除商品，恢复库存' + ) + + # 记录操作日志 + OperationLog.objects.create( + operator=request.user, + operation_type='SALE', + details=f'从销售单 #{sale.id} 中删除商品 {item.product.name}', + related_object_id=sale.id, + related_content_type=ContentType.objects.get_for_model(Sale) + ) + + # 删除商品并更新销售单总额 + item.delete() + sale.update_total_amount() + sale.save() + except SaleItem.DoesNotExist: + messages.error(request, '销售商品不存在') + return redirect('sale_item_create', sale_id=sale.id) + except Inventory.DoesNotExist: + messages.error(request, '找不到对应库存记录') + return redirect('sale_item_create', sale_id=sale.id) messages.success(request, '商品已从销售单中删除') return redirect('sale_item_create', sale_id=sale.id) diff --git a/inventory/views/system/backup.py b/inventory/views/system/backup.py index 39a2423..20df3e2 100644 --- a/inventory/views/system/backup.py +++ b/inventory/views/system/backup.py @@ -19,6 +19,7 @@ import shutil import logging import re +import tempfile import zipfile from datetime import datetime @@ -64,6 +65,49 @@ def get_dir_size_display(dir_path): else: return f"{size_bytes / (1024 * 1024 * 1024):.2f} GB" + +def build_backup_context(backup_name, backup_dir, backup_info): + """Build the context shape expected by backup confirmation templates.""" + created_at = backup_info.get('created_at') + if isinstance(created_at, str) and created_at: + try: + created_at = datetime.fromisoformat(created_at) + except ValueError: + created_at = None + + backup = { + 'name': backup_name, + 'created_at': created_at, + 'created_by': backup_info.get('created_by', '未知'), + 'size': get_dir_size_display(backup_dir), + 'includes_media': backup_info.get('includes_media', False), + } + return { + 'backup': backup, + 'backup_name': backup_name, + 'backup_info': backup_info, + } + + +def remove_path(path): + if os.path.isdir(path) and not os.path.islink(path): + shutil.rmtree(path) + elif os.path.exists(path): + os.remove(path) + + +def replace_media_root(source_dir): + remove_path(settings.MEDIA_ROOT) + os.makedirs(os.path.dirname(settings.MEDIA_ROOT), exist_ok=True) + shutil.copytree(source_dir, settings.MEDIA_ROOT) + + +def restore_previous_media(previous_media_dir, had_previous_media): + remove_path(settings.MEDIA_ROOT) + if had_previous_media: + os.makedirs(os.path.dirname(settings.MEDIA_ROOT), exist_ok=True) + shutil.copytree(previous_media_dir, settings.MEDIA_ROOT) + @login_required @permission_required('inventory.can_manage_backup') def backup_list(request): @@ -209,85 +253,86 @@ def restore_backup(request, backup_name): if os.path.exists(backup_info_file): with open(backup_info_file, 'r', encoding='utf-8') as f: backup_info = json.load(f) + context = build_backup_context(backup_name, backup_dir, backup_info) if request.method == 'POST': # 确认恢复 - confirmed = request.POST.get('confirm') == 'on' + confirmed = ( + request.POST.get('confirm') == 'on' + or request.POST.get('confirm_restore') == 'on' + ) if not confirmed: messages.error(request, "请确认您要恢复备份") - return render(request, 'inventory/system/restore_backup.html', { - 'backup_name': backup_name, - 'backup_info': backup_info - }) + return render(request, 'inventory/system/restore_backup.html', context) + temp_restore_root = None + previous_media_dir = None + had_previous_media = False + staged_media_dir = None + media_replacement_started = False + try: # 恢复数据库 db_file = os.path.join(backup_dir, 'db.json') if not os.path.exists(db_file): messages.error(request, f"备份文件 {db_file} 不存在") return redirect('backup_list') - - # 先清空数据库再加载快照；loaddata 只会 upsert，不能删除备份后新增的数据。 - with transaction.atomic(): - management.call_command('flush', '--noinput', verbosity=0) - management.call_command('loaddata', db_file, verbosity=0) - - # 恢复媒体文件 + restore_media = request.POST.get('restore_media') == 'on' if restore_media and backup_info.get('includes_media', False): media_dir = os.path.join(backup_dir, 'media') if os.path.exists(media_dir): - # 清空现有媒体目录 + os.makedirs(settings.TEMP_DIR, exist_ok=True) + temp_restore_root = tempfile.mkdtemp(prefix='restore-', dir=settings.TEMP_DIR) + staged_media_dir = os.path.join(temp_restore_root, 'media') + shutil.copytree(media_dir, staged_media_dir) + if os.path.exists(settings.MEDIA_ROOT): - for item in os.listdir(settings.MEDIA_ROOT): - item_path = os.path.join(settings.MEDIA_ROOT, item) - if os.path.isdir(item_path): - shutil.rmtree(item_path) - else: - os.remove(item_path) - - # 复制备份中的媒体文件 - for item in os.listdir(media_dir): - src_path = os.path.join(media_dir, item) - dst_path = os.path.join(settings.MEDIA_ROOT, item) - if os.path.isdir(src_path): - if os.path.exists(dst_path): - shutil.rmtree(dst_path) - shutil.copytree(src_path, dst_path) - else: - if os.path.exists(dst_path): - os.remove(dst_path) - shutil.copy2(src_path, dst_path) + previous_media_dir = os.path.join(temp_restore_root, 'previous_media') + shutil.copytree(settings.MEDIA_ROOT, previous_media_dir) + had_previous_media = True - # 恢复快照后，执行恢复的用户可能已不存在于当前数据库。 - restored_user = get_user_model().objects.filter(pk=request.user.pk).first() - if restored_user: - LogEntry.objects.create( - user=restored_user, - action_flag=2, # 修改 - content_type_id=None, # 自定义日志，无关联内容类型（id=0 会违反外键约束） - object_id=backup_name, - object_repr=f'恢复备份: {backup_name}', - change_message=f'恢复了系统备份 {backup_name}' + (' 包含媒体文件' if restore_media else '') - ) - else: - logger.warning("恢复备份后执行用户不存在，跳过管理日志记录: %s", backup_name) + # 先清空数据库再加载快照；loaddata 只会 upsert，不能删除备份后新增的数据。 + # 媒体替换也放在事务范围内触发，若失败则回滚数据库并恢复原媒体目录。 + with transaction.atomic(): + management.call_command('flush', '--noinput', verbosity=0) + management.call_command('loaddata', db_file, verbosity=0) + + if staged_media_dir: + media_replacement_started = True + replace_media_root(staged_media_dir) + + # 恢复快照后，执行恢复的用户可能已不存在于当前数据库。 + restored_user = get_user_model().objects.filter(pk=request.user.pk).first() + if restored_user: + LogEntry.objects.create( + user=restored_user, + action_flag=2, # 修改 + content_type_id=None, # 自定义日志，无关联内容类型（id=0 会违反外键约束） + object_id=backup_name, + object_repr=f'恢复备份: {backup_name}', + change_message=f'恢复了系统备份 {backup_name}' + (' 包含媒体文件' if restore_media else '') + ) + else: + logger.warning("恢复备份后执行用户不存在，跳过管理日志记录: %s", backup_name) messages.success(request, f"成功恢复备份: {backup_name}") return redirect('system_settings') except Exception as e: + if media_replacement_started: + try: + restore_previous_media(previous_media_dir, had_previous_media) + except Exception as restore_error: + logger.error(f"恢复原媒体目录失败: {restore_error}") messages.error(request, f"恢复备份失败: {str(e)}") logger.error(f"恢复备份失败: {str(e)}") - return render(request, 'inventory/system/restore_backup.html', { - 'backup_name': backup_name, - 'backup_info': backup_info - }) + return render(request, 'inventory/system/restore_backup.html', context) + finally: + if temp_restore_root and os.path.exists(temp_restore_root): + shutil.rmtree(temp_restore_root, ignore_errors=True) - return render(request, 'inventory/system/restore_backup.html', { - 'backup_name': backup_name, - 'backup_info': backup_info - }) + return render(request, 'inventory/system/restore_backup.html', context) @login_required @permission_required('inventory.can_manage_backup') @@ -303,13 +348,14 @@ def delete_backup(request, backup_name): if not os.path.exists(backup_dir): messages.error(request, f"备份 {backup_name} 不存在") return redirect('backup_list') + context = {'backup_name': backup_name} if request.method == 'POST': # 确认删除 confirmed = request.POST.get('confirm') == 'on' if not confirmed: messages.error(request, "请确认您要删除备份") - return render(request, 'inventory/system/delete_backup.html', {'backup_name': backup_name}) + return render(request, 'inventory/system/delete_backup.html', context) try: # 删除备份目录 @@ -331,9 +377,9 @@ def delete_backup(request, backup_name): except Exception as e: messages.error(request, f"删除备份失败: {str(e)}") logger.error(f"删除备份失败: {str(e)}") - return render(request, 'inventory/system/delete_backup.html', {'backup_name': backup_name}) + return render(request, 'inventory/system/delete_backup.html', context) - return render(request, 'inventory/system/delete_backup.html', {'backup_name': backup_name}) + return render(request, 'inventory/system/delete_backup.html', context) @login_required @permission_required('inventory.can_manage_backup') diff --git a/inventory/views/system/log.py b/inventory/views/system/log.py index bfba22b..88aea0b 100644 --- a/inventory/views/system/log.py +++ b/inventory/views/system/log.py @@ -248,7 +248,7 @@ def download_log_file(request, file_name): LogEntry.objects.create( user=request.user, action_flag=1, - content_type_id=0, + content_type_id=None, object_id=file_name, object_repr=f'下载日志: {file_name}', change_message=f'下载了日志文件 {file_name}' @@ -294,7 +294,7 @@ def delete_log_file(request, file_name): LogEntry.objects.create( user=request.user, action_flag=3, - content_type_id=0, + content_type_id=None, object_id=file_name, object_repr=f'删除日志: {file_name}', change_message=f'删除了日志文件 {file_name}'