fix minor edge case

This commit is contained in:
Your Name 2025-01-28 21:52:14 -05:00 committed by Henri Dickson
parent 26858ee905
commit 2eff282fe5
3 changed files with 8 additions and 6 deletions

View file

@ -289,6 +289,8 @@ def merge(request, item_path, item_uuid):
_("Cannot merge items in different categories") _("Cannot merge items in different categories")
+ f" ({item.class_name} to {new_item.class_name})" + f" ({item.class_name} to {new_item.class_name})"
) )
if new_item == item:
raise BadRequest(_("Cannot merge an item to itself"))
logger.warning(f"{request.user} merges {item} to {new_item}") logger.warning(f"{request.user} merges {item} to {new_item}")
item.merge_to(new_item) item.merge_to(new_item)
django_rq.get_queue("crawl").enqueue( django_rq.get_queue("crawl").enqueue(

View file

@ -1,4 +1,5 @@
from .csv import CsvExporter from .csv import CsvExporter
from .doufen import DoufenExporter from .doufen import DoufenExporter
from .ndjson import NdjsonExporter
__all__ = ["DoufenExporter", "CsvExporter"] __all__ = ["DoufenExporter", "CsvExporter", "NdjsonExporter"]

View file

@ -9,12 +9,10 @@ from django.http import HttpResponse
from django.shortcuts import redirect, render from django.shortcuts import redirect, render
from django.urls import reverse from django.urls import reverse
from django.utils import timezone, translation from django.utils import timezone, translation
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext as _
from common.utils import GenerateDateUUIDMediaFilePath from common.utils import GenerateDateUUIDMediaFilePath
from journal.exporters import DoufenExporter from journal.exporters import CsvExporter, DoufenExporter, NdjsonExporter
from journal.exporters.csv import CsvExporter
from journal.exporters.ndjson import NdjsonExporter
from journal.importers import ( from journal.importers import (
DoubanImporter, DoubanImporter,
GoodreadsImporter, GoodreadsImporter,
@ -23,9 +21,10 @@ from journal.importers import (
) )
from journal.models import ShelfType, reset_journal_visibility_for_user from journal.models import ShelfType, reset_journal_visibility_for_user
from social.models import reset_social_visibility_for_user from social.models import reset_social_visibility_for_user
from takahe.utils import Takahe
from users.models import Task from users.models import Task
from .account import * from .account import clear_preference_cache
@login_required @login_required