From 6f3804e9d220821e58842dbfdeb9f210011749f6 Mon Sep 17 00:00:00 2001 From: Kelvin Muchiri Date: Tue, 22 Oct 2024 11:16:11 +0300 Subject: [PATCH] fix ImportError fix ImportError: cannot import name 'SoftDeleteManager' from 'onadata.libs.models' --- onadata/apps/logger/models/attachment.py | 2 +- onadata/apps/logger/models/data_view.py | 2 +- onadata/libs/models/__init__.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/onadata/apps/logger/models/attachment.py b/onadata/apps/logger/models/attachment.py index 09085ac8de..290b9ccb6e 100644 --- a/onadata/apps/logger/models/attachment.py +++ b/onadata/apps/logger/models/attachment.py @@ -10,7 +10,7 @@ from django.contrib.auth import get_user_model from django.db import models -from onadata.libs.models.base_model import SoftDeleteManager +from onadata.libs.models import SoftDeleteManager def get_original_filename(filename): diff --git a/onadata/apps/logger/models/data_view.py b/onadata/apps/logger/models/data_view.py index 6339449ee1..6de02b0d58 100644 --- a/onadata/apps/logger/models/data_view.py +++ b/onadata/apps/logger/models/data_view.py @@ -15,7 +15,7 @@ from django.utils.translation import gettext as _ from onadata.apps.viewer.parsed_instance_tools import get_where_clause -from onadata.libs.models.base_model import SoftDeleteManager +from onadata.libs.models import SoftDeleteManager from onadata.libs.models.sorting import ( # noqa pylint: disable=unused-import json_order_by, json_order_by_params, diff --git a/onadata/libs/models/__init__.py b/onadata/libs/models/__init__.py index 1de471a73a..d6163cf9e1 100644 --- a/onadata/libs/models/__init__.py +++ b/onadata/libs/models/__init__.py @@ -2,4 +2,6 @@ """ Model utility classes and functions. """ + from .base_model import BaseModel # noqa +from .base_model import SoftDeleteManager # noqa