Commit eca8d956 authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

fix conflicts

parent a8648e7b

src/resources/migrations/0046_merge_20260129_0939.py

0 → 100644
+12 −0
Original line number Diff line number Diff line 
# Generated by Django 6.0 on 2026-01-29 09:39



from django.db import migrations





class Migration(migrations.Migration):

    dependencies = [

        ("resources", "0044_project_collections_pipelines_and_more"),

        ("resources", "0045_file_integrity_check_failed_at"),

    ]



    operations = []

src/rpc/methods.py

+0 −3
Original line number Diff line number Diff line
@@ -3204,7 +3204,6 @@ def update_collection_from_xlsx_row(user: User, collection_data: dict) -> bool: 
    """

    Compound method to update collection and collection metadatas from a xlsx file row.

    """

<<<<<<< HEAD

    collection_instance: Collection = Collection.objects.filter(

        pk=collection_data.get("collection_pk"), deleted_at__isnull=True

    ).first()
@@ -3255,8 +3254,6 @@ def update_collection_from_xlsx_row(user: User, collection_data: dict) -> bool: 
            new_dict["title"] = descendant_resource_instance.title

            new_dict["cascade"] = "n"

            update_resource_from_xlsx_row(user, new_dict)

=======

>>>>>>> 571c173 (better file integrity check + collections xls first pass)

    return True