From 3bd33db0234c7dc2c609510110cb682892a78c2c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 29 Jan 2019 04:32:57 -0400 Subject: [PATCH] Update serializer_string to serializer_path Signed-off-by: Roberto Rosario --- mayan/apps/cabinets/search.py | 2 +- mayan/apps/dynamic_search/classes.py | 6 +++--- mayan/apps/metadata/search.py | 2 +- mayan/apps/permissions/search.py | 2 +- mayan/apps/user_management/search.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mayan/apps/cabinets/search.py b/mayan/apps/cabinets/search.py index 24107d6f69..ed1194341c 100644 --- a/mayan/apps/cabinets/search.py +++ b/mayan/apps/cabinets/search.py @@ -9,7 +9,7 @@ from .permissions import permission_cabinet_view cabinet_search = SearchModel( app_label='cabinets', model_name='Cabinet', permission=permission_cabinet_view, - serializer_string='mayan.apps.cabinets.serializers.CabinetSerializer' + serializer_path='mayan.apps.cabinets.serializers.CabinetSerializer' ) cabinet_search.add_model_field( diff --git a/mayan/apps/dynamic_search/classes.py b/mayan/apps/dynamic_search/classes.py index a37d1a3f21..d49f5af4dc 100644 --- a/mayan/apps/dynamic_search/classes.py +++ b/mayan/apps/dynamic_search/classes.py @@ -90,17 +90,17 @@ class SearchModel(object): except KeyError: raise KeyError(_('No search model matching the query')) if not hasattr(result, 'serializer'): - result.serializer = import_string(result.serializer_string) + result.serializer = import_string(result.serializer_path) return result - def __init__(self, app_label, model_name, serializer_string, label=None, permission=None): + def __init__(self, app_label, model_name, serializer_path, label=None, permission=None): self.app_label = app_label self.model_name = model_name self.search_fields = [] self._model = None # Lazy self._label = label - self.serializer_string = serializer_string + self.serializer_path = serializer_path self.permission = permission self.__class__._registry[self.get_full_name()] = self diff --git a/mayan/apps/metadata/search.py b/mayan/apps/metadata/search.py index ba11ff1ca2..37023357ea 100644 --- a/mayan/apps/metadata/search.py +++ b/mayan/apps/metadata/search.py @@ -9,7 +9,7 @@ from .permissions import permission_metadata_type_view metadata_type_search = SearchModel( app_label='metadata', model_name='MetadataType', permission=permission_metadata_type_view, - serializer_string='mayan.apps.metadata.serializers.MetadataTypeSerializer' + serializer_path='mayan.apps.metadata.serializers.MetadataTypeSerializer' ) metadata_type_search.add_model_field( diff --git a/mayan/apps/permissions/search.py b/mayan/apps/permissions/search.py index 21ac3f9c52..a5aca3473f 100644 --- a/mayan/apps/permissions/search.py +++ b/mayan/apps/permissions/search.py @@ -9,7 +9,7 @@ from .permissions import permission_role_view role_search = SearchModel( app_label='permissions', model_name='Role', permission=permission_role_view, - serializer_string='mayan.apps.permissions.serializers.RoleSerializer' + serializer_path='mayan.apps.permissions.serializers.RoleSerializer' ) role_search.add_model_field( diff --git a/mayan/apps/user_management/search.py b/mayan/apps/user_management/search.py index 54e7a26dc2..6ebf50546b 100644 --- a/mayan/apps/user_management/search.py +++ b/mayan/apps/user_management/search.py @@ -12,7 +12,7 @@ user_app, user_model = settings.AUTH_USER_MODEL.split('.') user_search = SearchModel( app_label=user_app, model_name=user_model, permission=permission_user_view, - serializer_string='mayan.apps.user_management.serializers.UserSerializer' + serializer_path='mayan.apps.user_management.serializers.UserSerializer' ) user_search.add_model_field( @@ -34,7 +34,7 @@ user_search.add_model_field( group_search = SearchModel( app_label='auth', model_name='Group', permission=permission_group_view, - serializer_string='user_management.serializers.GroupSerializer' + serializer_path='user_management.serializers.GroupSerializer' ) group_search.add_model_field(