Loading src/rpc/methods.py +3 −0 Original line number Diff line number Diff line Loading @@ -3204,6 +3204,7 @@ 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() Loading Loading @@ -3254,6 +3255,8 @@ 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 Loading Loading
src/rpc/methods.py +3 −0 Original line number Diff line number Diff line Loading @@ -3204,6 +3204,7 @@ 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() Loading Loading @@ -3254,6 +3255,8 @@ 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 Loading