From 877713f759ff79998ed58cb480039838eba8d691 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 7 Mar 2017 16:24:41 +0100 Subject: [PATCH 2/2] remove useless reimplementations of get_verbose_name (#15314) --- passerelle/apps/choosit/models.py | 8 -------- passerelle/apps/clicrdv/models.py | 4 ---- passerelle/apps/csvdatasource/models.py | 4 ---- passerelle/apps/family/models.py | 4 ---- passerelle/apps/pastell/models.py | 4 ---- passerelle/base/models.py | 4 ---- passerelle/contrib/agoraplus/models.py | 4 ---- passerelle/contrib/fake_family/models.py | 4 ---- passerelle/contrib/iparapheur/models.py | 4 ---- passerelle/contrib/maarch/models.py | 4 ---- passerelle/contrib/mdel/models.py | 4 ---- passerelle/contrib/meyzieu_newsletters/models.py | 4 ---- passerelle/contrib/nancypoll/models.py | 4 ---- passerelle/contrib/seisin_by_email/models.py | 4 ---- passerelle/contrib/solis_apa/models.py | 4 ---- passerelle/contrib/teamnet_axel/models.py | 4 ---- 16 files changed, 68 deletions(-) diff --git a/passerelle/apps/choosit/models.py b/passerelle/apps/choosit/models.py index d8bb92a..e42d459 100644 --- a/passerelle/apps/choosit/models.py +++ b/passerelle/apps/choosit/models.py @@ -72,10 +72,6 @@ class ChoositSMSGateway(BaseResource, SMSGatewayMixin): db_table = 'sms_choosit' @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - - @classmethod def get_icon_class(cls): return 'phone' @@ -138,10 +134,6 @@ class ChoositRegisterGateway(BaseResource): db_table = 'registration_choosit' @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - - @classmethod def get_icon_class(cls): return 'ressources' diff --git a/passerelle/apps/clicrdv/models.py b/passerelle/apps/clicrdv/models.py index cd06449..1f4be57 100644 --- a/passerelle/apps/clicrdv/models.py +++ b/passerelle/apps/clicrdv/models.py @@ -43,10 +43,6 @@ class ClicRdv(BaseResource): verbose_name = _('Clicrdv Agenda') @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - - @classmethod def get_icon_class(cls): return 'clock' diff --git a/passerelle/apps/csvdatasource/models.py b/passerelle/apps/csvdatasource/models.py index 5fb40d4..7d24833 100644 --- a/passerelle/apps/csvdatasource/models.py +++ b/passerelle/apps/csvdatasource/models.py @@ -153,10 +153,6 @@ class CsvDataSource(BaseResource): self._dialect_options = value @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - - @classmethod def get_icon_class(cls): return 'grid' diff --git a/passerelle/apps/family/models.py b/passerelle/apps/family/models.py index 6f1fb03..d2c4eae 100644 --- a/passerelle/apps/family/models.py +++ b/passerelle/apps/family/models.py @@ -119,10 +119,6 @@ class GenericFamily(BaseResource): def get_icon_class(cls): return 'family' - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - def clean(self): if self.archive: try: diff --git a/passerelle/apps/pastell/models.py b/passerelle/apps/pastell/models.py index abc73f8..d10bbf6 100644 --- a/passerelle/apps/pastell/models.py +++ b/passerelle/apps/pastell/models.py @@ -42,10 +42,6 @@ class Pastell(BaseResource): return reverse('pastell-add') @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - - @classmethod def get_icon_class(cls): return 'pastell' diff --git a/passerelle/base/models.py b/passerelle/base/models.py index 1748b73..b420735 100644 --- a/passerelle/base/models.py +++ b/passerelle/base/models.py @@ -157,10 +157,6 @@ class BaseResource(models.Model): return passerelle.utils.LoggedRequest(logger=self.logger) @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - - @classmethod def get_connector_slug(cls): return cls._meta.app_label.replace('_', '-') diff --git a/passerelle/contrib/agoraplus/models.py b/passerelle/contrib/agoraplus/models.py index 7d43f2d..14cfb40 100644 --- a/passerelle/contrib/agoraplus/models.py +++ b/passerelle/contrib/agoraplus/models.py @@ -116,10 +116,6 @@ class AgoraPlus(BaseResource): def get_icon_class(cls): return 'family' - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - # # plumber stuff : request with "oauth token" # diff --git a/passerelle/contrib/fake_family/models.py b/passerelle/contrib/fake_family/models.py index c7c49be..1f91057 100644 --- a/passerelle/contrib/fake_family/models.py +++ b/passerelle/contrib/fake_family/models.py @@ -42,10 +42,6 @@ class FakeFamily(BaseResource): def get_icon_class(cls): return 'family' - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - def get_familyid_by_nameid(self, nameid): '''get family_id (or None) linked to the nameid, and do some checks''' adult_id = self.jsondatabase['links'].get(nameid) diff --git a/passerelle/contrib/iparapheur/models.py b/passerelle/contrib/iparapheur/models.py index 21d2660..d3d12bc 100644 --- a/passerelle/contrib/iparapheur/models.py +++ b/passerelle/contrib/iparapheur/models.py @@ -75,10 +75,6 @@ class IParapheur(BaseResource): def get_icon_class(cls): return 'ressources' - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - @endpoint(serializer_type='json-api', perm='can_access') def types(self, request): c = get_client(self) diff --git a/passerelle/contrib/maarch/models.py b/passerelle/contrib/maarch/models.py index d850f2b..bf17fa9 100644 --- a/passerelle/contrib/maarch/models.py +++ b/passerelle/contrib/maarch/models.py @@ -42,7 +42,3 @@ class Maarch(BaseResource): @classmethod def get_icon_class(cls): return 'ressources' - - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name diff --git a/passerelle/contrib/mdel/models.py b/passerelle/contrib/mdel/models.py index a79e8f0..c63d12c 100644 --- a/passerelle/contrib/mdel/models.py +++ b/passerelle/contrib/mdel/models.py @@ -84,10 +84,6 @@ class MDEL(BaseResource): def get_icon_class(cls): return 'ressources' - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - @endpoint(serializer_type='json-api', perm='can_access', methods=['post']) def create(self, request, *args, **kwargs): """Create a demand diff --git a/passerelle/contrib/meyzieu_newsletters/models.py b/passerelle/contrib/meyzieu_newsletters/models.py index 29949fd..cf8316f 100644 --- a/passerelle/contrib/meyzieu_newsletters/models.py +++ b/passerelle/contrib/meyzieu_newsletters/models.py @@ -49,10 +49,6 @@ class MeyzieuNewsletters(BaseResource): def get_icon_class(cls): return 'ressources' - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - def get_transport_title(self, transport_id): return self.transport_titles_mapping.get(transport_id, transport_id) diff --git a/passerelle/contrib/nancypoll/models.py b/passerelle/contrib/nancypoll/models.py index 09a12af..8c91ce5 100644 --- a/passerelle/contrib/nancypoll/models.py +++ b/passerelle/contrib/nancypoll/models.py @@ -24,10 +24,6 @@ class NancyPoll(BaseResource): verbose_name = _('NancyPoll') @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - - @classmethod def get_icon_class(cls): return 'grid' diff --git a/passerelle/contrib/seisin_by_email/models.py b/passerelle/contrib/seisin_by_email/models.py index a16c2cd..221e448 100644 --- a/passerelle/contrib/seisin_by_email/models.py +++ b/passerelle/contrib/seisin_by_email/models.py @@ -42,7 +42,3 @@ class SeisinByEmailManagement(BaseResource): @classmethod def get_icon_class(cls): return 'ressources' - - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name diff --git a/passerelle/contrib/solis_apa/models.py b/passerelle/contrib/solis_apa/models.py index d97af9e..a3b3a78 100644 --- a/passerelle/contrib/solis_apa/models.py +++ b/passerelle/contrib/solis_apa/models.py @@ -59,10 +59,6 @@ class SolisAPA(BaseResource): def get_icon_class(cls): return 'ressources' - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - def _check_requests_response(self, response): try: ret = response.json() diff --git a/passerelle/contrib/teamnet_axel/models.py b/passerelle/contrib/teamnet_axel/models.py index f1f5599..03557f6 100644 --- a/passerelle/contrib/teamnet_axel/models.py +++ b/passerelle/contrib/teamnet_axel/models.py @@ -69,10 +69,6 @@ class Management(BaseResource): def get_icon_class(cls): return 'ressources' - @classmethod - def get_verbose_name(cls): - return cls._meta.verbose_name - # # Axel SOAP call: getData # -- 2.1.4