fix minor edge case

catalog/views_edit.py

@@ -289,6 +289,8 @@ def merge(request, item_path, item_uuid):
                 _("Cannot merge items in different categories")
                 + 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}")
         item.merge_to(new_item)
         django_rq.get_queue("crawl").enqueue(

journal/exporters/__init__.py

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

users/views/data.py

@@ -9,12 +9,10 @@ from django.http import HttpResponse
 from django.shortcuts import redirect, render
 from django.urls import reverse
 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 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 (
     DoubanImporter,
     GoodreadsImporter,
@@ -23,9 +21,10 @@ from journal.importers import (
 )
 from journal.models import ShelfType, reset_journal_visibility_for_user
 from social.models import reset_social_visibility_for_user
+from takahe.utils import Takahe
 from users.models import Task
 
-from .account import *
+from .account import clear_preference_cache
 
 
 @login_required