From 2e5eb3666a997ff6731932d3b3d3aa35f635fa32 Mon Sep 17 00:00:00 2001 From: Martin Koistinen Date: Tue, 5 Jul 2016 13:32:46 -0400 Subject: [PATCH] Revert "Let link attributes be optional" (#251) --- HISTORY | 1 - .../migrations/0004_auto_20160705_1136.py | 27 ------------------- cmsplugin_filer_file/models.py | 2 +- .../migrations/0008_auto_20160705_1136.py | 27 ------------------- cmsplugin_filer_image/models.py | 2 +- .../migrations/0006_auto_20160705_1136.py | 27 ------------------- cmsplugin_filer_link/models.py | 2 +- 7 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 cmsplugin_filer_file/migrations/0004_auto_20160705_1136.py delete mode 100644 cmsplugin_filer_image/migrations/0008_auto_20160705_1136.py delete mode 100644 cmsplugin_filer_link/migrations/0006_auto_20160705_1136.py diff --git a/HISTORY b/HISTORY index a0ecffdf..1854069a 100644 --- a/HISTORY +++ b/HISTORY @@ -7,7 +7,6 @@ CHANGELOG * Pinned to djangocms-attributes-field v0.1.0 * Fixed model name used in migration * Fixed an issue with folder plugin in Django 1.9 -* Allowed link attributes to be optional 1.1.1 (2016-06-22) diff --git a/cmsplugin_filer_file/migrations/0004_auto_20160705_1136.py b/cmsplugin_filer_file/migrations/0004_auto_20160705_1136.py deleted file mode 100644 index 3cc13f8d..00000000 --- a/cmsplugin_filer_file/migrations/0004_auto_20160705_1136.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-05 15:36 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import djangocms_attributes_field.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('cmsplugin_filer_file', '0003_filerfile_link_attributes'), - ] - - operations = [ - migrations.AlterField( - model_name='filerfile', - name='cmsplugin_ptr', - field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='cmsplugin_filer_file_filerfile', serialize=False, to='cms.CMSPlugin'), - ), - migrations.AlterField( - model_name='filerfile', - name='link_attributes', - field=djangocms_attributes_field.fields.AttributesField(blank=True, default=dict, help_text='Optional. Adds HTML attributes to the rendered link.'), - ), - ] diff --git a/cmsplugin_filer_file/models.py b/cmsplugin_filer_file/models.py index bb7308c3..38c654d0 100644 --- a/cmsplugin_filer_file/models.py +++ b/cmsplugin_filer_file/models.py @@ -40,7 +40,7 @@ class FilerFile(CMSPlugin): target_blank = models.BooleanField(_('Open link in new window'), default=False) style = models.CharField( _('Style'), choices=STYLE_CHOICES, default=DEFAULT_STYLE, max_length=255, blank=True) - link_attributes = AttributesField(excluded_keys=EXCLUDED_KEYS, blank=True, + link_attributes = AttributesField(excluded_keys=EXCLUDED_KEYS, help_text=_('Optional. Adds HTML attributes to the rendered link.')) objects = FilerPluginManager(select_related=('file',)) diff --git a/cmsplugin_filer_image/migrations/0008_auto_20160705_1136.py b/cmsplugin_filer_image/migrations/0008_auto_20160705_1136.py deleted file mode 100644 index de6f575c..00000000 --- a/cmsplugin_filer_image/migrations/0008_auto_20160705_1136.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-05 15:36 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import djangocms_attributes_field.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('cmsplugin_filer_image', '0007_filerimage_link_attributes'), - ] - - operations = [ - migrations.AlterField( - model_name='filerimage', - name='cmsplugin_ptr', - field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='cmsplugin_filer_image_filerimage', serialize=False, to='cms.CMSPlugin'), - ), - migrations.AlterField( - model_name='filerimage', - name='link_attributes', - field=djangocms_attributes_field.fields.AttributesField(blank=True, default=dict, help_text='Optional. Adds HTML attributes to the rendered link.'), - ), - ] diff --git a/cmsplugin_filer_image/models.py b/cmsplugin_filer_image/models.py index cbf19d89..48cfdbca 100644 --- a/cmsplugin_filer_image/models.py +++ b/cmsplugin_filer_image/models.py @@ -74,7 +74,7 @@ class FilerImage(CMSPlugin): help_text=_("if present image will be clickable")) description = models.TextField(_("description"), blank=True, null=True) target_blank = models.BooleanField(_('Open link in new window'), default=False) - link_attributes = AttributesField(excluded_keys=EXCLUDED_KEYS, blank=True, + link_attributes = AttributesField(excluded_keys=EXCLUDED_KEYS, help_text=_('Optional. Adds HTML attributes to the rendered link.')) # we only add the image to select_related. page_link and file_link are FKs diff --git a/cmsplugin_filer_link/migrations/0006_auto_20160705_1136.py b/cmsplugin_filer_link/migrations/0006_auto_20160705_1136.py deleted file mode 100644 index bd5a6891..00000000 --- a/cmsplugin_filer_link/migrations/0006_auto_20160705_1136.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-07-05 15:36 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import djangocms_attributes_field.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('cmsplugin_filer_link', '0005_filerlinkplugin_link_attributes'), - ] - - operations = [ - migrations.AlterField( - model_name='filerlinkplugin', - name='cmsplugin_ptr', - field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='cmsplugin_filer_link_filerlinkplugin', serialize=False, to='cms.CMSPlugin'), - ), - migrations.AlterField( - model_name='filerlinkplugin', - name='link_attributes', - field=djangocms_attributes_field.fields.AttributesField(blank=True, default=dict, help_text='Optional. Adds HTML attributes to the rendered link.'), - ), - ] diff --git a/cmsplugin_filer_link/models.py b/cmsplugin_filer_link/models.py index ff3a79b7..9d9470cb 100644 --- a/cmsplugin_filer_link/models.py +++ b/cmsplugin_filer_link/models.py @@ -41,7 +41,7 @@ class FilerLinkPlugin(CMSPlugin): new_window = models.BooleanField(_("new window?"), default=False, help_text=_("Do you want this link to open a new window?")) file = FilerFileField(blank=True, null=True, on_delete=models.SET_NULL) - link_attributes = AttributesField(excluded_keys=EXCLUDED_KEYS, blank=True, + link_attributes = AttributesField(excluded_keys=EXCLUDED_KEYS, help_text=_('Optional. Adds HTML attributes to the rendered link.')) def __str__(self):