From 133b0ffa168c38cc057afaaf9045a876016718bf Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 7 Mar 2017 16:24:33 +0100 Subject: [PATCH 1/2] enable connectors by default (#15314) --- passerelle/apps/csvdatasource/models.py | 4 ---- passerelle/apps/family/models.py | 4 ---- passerelle/base/models.py | 2 +- passerelle/contrib/meyzieu_newsletters/models.py | 4 ---- passerelle/contrib/nancypoll/models.py | 4 ---- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/passerelle/apps/csvdatasource/models.py b/passerelle/apps/csvdatasource/models.py index 011e19f..5fb40d4 100644 --- a/passerelle/apps/csvdatasource/models.py +++ b/passerelle/apps/csvdatasource/models.py @@ -160,10 +160,6 @@ class CsvDataSource(BaseResource): def get_icon_class(cls): return 'grid' - @classmethod - def is_enabled(cls): - return True - def get_content_without_bom(self): self.csv_file.seek(0) content = self.csv_file.read() diff --git a/passerelle/apps/family/models.py b/passerelle/apps/family/models.py index fa4f354..6f1fb03 100644 --- a/passerelle/apps/family/models.py +++ b/passerelle/apps/family/models.py @@ -120,10 +120,6 @@ class GenericFamily(BaseResource): return 'family' @classmethod - def is_enabled(cls): - return True - - @classmethod def get_verbose_name(cls): return cls._meta.verbose_name diff --git a/passerelle/base/models.py b/passerelle/base/models.py index 3c91ca2..1748b73 100644 --- a/passerelle/base/models.py +++ b/passerelle/base/models.py @@ -150,7 +150,7 @@ class BaseResource(models.Model): # get_icon_class won't be necessary anymore. if not hasattr(cls, 'get_icon_class'): return False - return getattr(settings, 'PASSERELLE_APP_%s_ENABLED' % cls._meta.app_label.upper(), False) + return getattr(settings, 'PASSERELLE_APP_%s_ENABLED' % cls._meta.app_label.upper(), True) @property def requests(self): diff --git a/passerelle/contrib/meyzieu_newsletters/models.py b/passerelle/contrib/meyzieu_newsletters/models.py index 2b22929..29949fd 100644 --- a/passerelle/contrib/meyzieu_newsletters/models.py +++ b/passerelle/contrib/meyzieu_newsletters/models.py @@ -46,10 +46,6 @@ class MeyzieuNewsletters(BaseResource): verbose_name = _('Meyzieu Newsletters') @classmethod - def is_enabled(cls): - return True - - @classmethod def get_icon_class(cls): return 'ressources' diff --git a/passerelle/contrib/nancypoll/models.py b/passerelle/contrib/nancypoll/models.py index 328885d..09a12af 100644 --- a/passerelle/contrib/nancypoll/models.py +++ b/passerelle/contrib/nancypoll/models.py @@ -31,10 +31,6 @@ class NancyPoll(BaseResource): def get_icon_class(cls): return 'grid' - @classmethod - def is_enabled(cls): - return True - @endpoint(serializer_type='json-api') def data(self, request, *args, **kwargs): street_no = request.GET.get('street_no') -- 2.1.4