From c889ee28eacb722b408031c6aceb3a966343c022 Mon Sep 17 00:00:00 2001 From: fuzzylogic2000 Date: Tue, 31 Mar 2020 09:32:47 +0200 Subject: [PATCH] cms/settings: remove unused wagtail settings --- apps/ideas/forms.py | 12 --------- cms/contrib/helpers.py | 9 +------ .../migrations/0002_remove_unused_settings.py | 24 +++++++++++++++++ cms/settings/models.py | 27 ------------------- 4 files changed, 25 insertions(+), 47 deletions(-) create mode 100644 cms/settings/migrations/0002_remove_unused_settings.py diff --git a/apps/ideas/forms.py b/apps/ideas/forms.py index c8a1da8d7..a490facaa 100644 --- a/apps/ideas/forms.py +++ b/apps/ideas/forms.py @@ -26,14 +26,6 @@ ACCEPT_CONDITIONS_LABEL = _('I hereby agree to the {}terms' ' of use{} of the Civic' ' Europe idea challenge.') -CONFIRM_IDEA_CHALLENGE_CAMP_WITH_DATE = _('If selected, a representative of ' - 'my project will commit to joining ' - 'the Idea Challenge Camp ' - 'from {} to {}.') -CONFIRM_IDEA_CHALLENGE_CAMP_WITHOUT_DATE = _('If selected, a representative ' - 'of my project will commit ' - 'to joining the Idea Challenge ' - 'Camp at the end of April 2018.') COWORKERS_TITLE = _('Please add your team members here.') COWORKERS_HELP = _('Here you can insert the email addresses of ' @@ -45,10 +37,6 @@ COWORKERS_EDIT_TITLE = _('Your team members') -IDEA_CHALLENGE_CAMP_OPTION_LINK = _('More information about ' - 'the {}Idea Challenge Camp{}. ' - '(max. 150 characters)') - class BaseForm(forms.ModelForm): do_not_call_in_templates = True # important when reading section name diff --git a/cms/contrib/helpers.py b/cms/contrib/helpers.py index 60829e28c..e5a5db760 100644 --- a/cms/contrib/helpers.py +++ b/cms/contrib/helpers.py @@ -2,7 +2,7 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.core.models import Site -from cms.settings.models import CollaborationCampSettings, HelpPages +from cms.settings.models import HelpPages LINK_TEXT = _('Please look {}here{} for more information.') @@ -23,10 +23,3 @@ def add_link_to_helptext(help_text, help_page_name, link_text=None): return '{} {}'.format(help_text, mark_safe(link_text)) return help_text - - -def get_idea_challenge_camp_settings(): - site = Site.objects.filter( - is_default_site=True - ).first() - return CollaborationCampSettings.for_site(site) diff --git a/cms/settings/migrations/0002_remove_unused_settings.py b/cms/settings/migrations/0002_remove_unused_settings.py new file mode 100644 index 000000000..96dd73a66 --- /dev/null +++ b/cms/settings/migrations/0002_remove_unused_settings.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.11 on 2020-03-31 07:21 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cms_settings', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='helppages', + name='annual_theme_help_page', + ), + migrations.RemoveField( + model_name='helppages', + name='communication_camp_help_page', + ), + migrations.DeleteModel( + name='CollaborationCampSettings', + ), + ] diff --git a/cms/settings/models.py b/cms/settings/models.py index 23bd79cc6..4f6b41eef 100644 --- a/cms/settings/models.py +++ b/cms/settings/models.py @@ -17,21 +17,6 @@ class SocialMediaSettings(BaseSetting): @register_setting class HelpPages(BaseSetting): - communication_camp_help_page = models.ForeignKey( - 'wagtailcore.Page', - related_name="help_page_communication_camp", - verbose_name='Idea Challenge Help Page', - null=True, - blank=True, - on_delete=models.SET_NULL, - help_text="Please add a link to the page that explains the idea challenge camp here.") - annual_theme_help_page = models.ForeignKey( - 'wagtailcore.Page', - related_name="help_page_annual_theme", - null=True, - blank=True, - on_delete=models.SET_NULL, - help_text="Please add a link to the page that explains the annual theme, impact and implementation.") terms_of_use_page = models.ForeignKey( 'wagtailcore.Page', related_name="help_page_terms_of_use_page", @@ -48,18 +33,6 @@ class HelpPages(BaseSetting): help_text="Please add a link to the page that explains the selection criteria here.") panels = [ - PageChooserPanel('communication_camp_help_page'), - PageChooserPanel('annual_theme_help_page'), PageChooserPanel('terms_of_use_page'), PageChooserPanel('selection_criteria') ] - - -@register_setting -class CollaborationCampSettings(BaseSetting): - start_date = models.DateField(blank=True, null=True) - end_date = models.DateField(blank=True, null=True) - description = models.TextField(blank=True) - - class Meta: - verbose_name = 'Idea Challenge Camp Settings'