From 0d8b053e9b7948e4e81b77e37f835734d321f08f Mon Sep 17 00:00:00 2001 From: Christoph Reimers Date: Thu, 23 Apr 2015 18:04:54 +0200 Subject: [PATCH 1/6] added 'title' to link model --- cmsplugin_filer_link/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmsplugin_filer_link/models.py b/cmsplugin_filer_link/models.py index 4fdbfc9d..22c8fba5 100644 --- a/cmsplugin_filer_link/models.py +++ b/cmsplugin_filer_link/models.py @@ -25,6 +25,8 @@ class FilerLinkPlugin(CMSPlugin): choices=LINK_STYLES, default=LINK_STYLES[0][0]) new_window = models.BooleanField(_("new window?"), default=False, help_text=_("Do you want this link to open a new window?")) + title = models.CharField(_('name'), max_length=255, blank=True, null=True, + help_text=_("May be set to add information about the nature of a link.")) file = FilerFileField(blank=True, null=True) From 61a404784542ea14b73903e52568c6e513fa4e29 Mon Sep 17 00:00:00 2001 From: Christoph Reimers Date: Thu, 23 Apr 2015 18:05:25 +0200 Subject: [PATCH 2/6] added 'title' to link template --- cmsplugin_filer_link/templates/cmsplugin_filer_link/link.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmsplugin_filer_link/templates/cmsplugin_filer_link/link.html b/cmsplugin_filer_link/templates/cmsplugin_filer_link/link.html index bfb99111..0220aac2 100644 --- a/cmsplugin_filer_link/templates/cmsplugin_filer_link/link.html +++ b/cmsplugin_filer_link/templates/cmsplugin_filer_link/link.html @@ -1 +1 @@ -{{ name }} \ No newline at end of file +{{ name }} From 761640fbfc2407b743486fc398f7c9d878a14613 Mon Sep 17 00:00:00 2001 From: Christoph Reimers Date: Fri, 8 May 2015 09:18:13 -0400 Subject: [PATCH 3/6] added instance.title to plugin context --- cmsplugin_filer_link/cms_plugins.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmsplugin_filer_link/cms_plugins.py b/cmsplugin_filer_link/cms_plugins.py index 1a2452fc..822ae167 100644 --- a/cmsplugin_filer_link/cms_plugins.py +++ b/cmsplugin_filer_link/cms_plugins.py @@ -31,6 +31,7 @@ def render(self, context, instance, placeholder): 'style': instance.link_style, 'name': instance.name, 'new_window': instance.new_window, + 'title': instance.title, }) return context From f694a31630f643e0be29dabcbbc3a98ad1cb9743 Mon Sep 17 00:00:00 2001 From: Christoph Reimers Date: Fri, 8 May 2015 09:18:35 -0400 Subject: [PATCH 4/6] django >= 1.7 migration for title field --- .../0002_filerlinkplugin_title.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 cmsplugin_filer_link/migrations_django/0002_filerlinkplugin_title.py diff --git a/cmsplugin_filer_link/migrations_django/0002_filerlinkplugin_title.py b/cmsplugin_filer_link/migrations_django/0002_filerlinkplugin_title.py new file mode 100644 index 00000000..3f2ecb3b --- /dev/null +++ b/cmsplugin_filer_link/migrations_django/0002_filerlinkplugin_title.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cmsplugin_filer_link', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='filerlinkplugin', + name='title', + field=models.CharField(help_text='May be set to add information about the nature of a link.', max_length=255, null=True, verbose_name='name', blank=True), + preserve_default=True, + ), + ] From b78e9d0da16817620ae41735e18ec6f08eb8afb2 Mon Sep 17 00:00:00 2001 From: Christoph Reimers Date: Fri, 8 May 2015 09:38:34 -0400 Subject: [PATCH 5/6] title field's name is title --- cmsplugin_filer_link/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmsplugin_filer_link/models.py b/cmsplugin_filer_link/models.py index 22c8fba5..0fb4d537 100644 --- a/cmsplugin_filer_link/models.py +++ b/cmsplugin_filer_link/models.py @@ -25,7 +25,7 @@ class FilerLinkPlugin(CMSPlugin): choices=LINK_STYLES, default=LINK_STYLES[0][0]) new_window = models.BooleanField(_("new window?"), default=False, help_text=_("Do you want this link to open a new window?")) - title = models.CharField(_('name'), max_length=255, blank=True, null=True, + title = models.CharField(_('title'), max_length=255, blank=True, null=True, help_text=_("May be set to add information about the nature of a link.")) file = FilerFileField(blank=True, null=True) From ee587aa69de194c0d15643c283e2cccbb50259c8 Mon Sep 17 00:00:00 2001 From: Christoph Reimers Date: Fri, 8 May 2015 09:39:00 -0400 Subject: [PATCH 6/6] added south migration for new title field --- ...4_auto__add_field_filerlinkplugin_title.py | 161 ++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 cmsplugin_filer_link/migrations/0004_auto__add_field_filerlinkplugin_title.py diff --git a/cmsplugin_filer_link/migrations/0004_auto__add_field_filerlinkplugin_title.py b/cmsplugin_filer_link/migrations/0004_auto__add_field_filerlinkplugin_title.py new file mode 100644 index 00000000..1d8769e6 --- /dev/null +++ b/cmsplugin_filer_link/migrations/0004_auto__add_field_filerlinkplugin_title.py @@ -0,0 +1,161 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'FilerLinkPlugin.title' + db.add_column(u'cmsplugin_filer_link_filerlinkplugin', 'title', + self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'FilerLinkPlugin.title' + db.delete_column(u'cmsplugin_filer_link_filerlinkplugin', 'title') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'cms.cmsplugin': { + 'Meta': {'object_name': 'CMSPlugin'}, + 'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}), + 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}), + 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}), + 'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), + 'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'cms.page': { + 'Meta': {'ordering': "('path',)", 'unique_together': "(('publisher_is_draft', 'site', 'application_namespace'), ('reverse_id', 'site', 'publisher_is_draft'))", 'object_name': 'Page'}, + 'application_namespace': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'application_urls': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'changed_by': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'created_by': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'in_navigation': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'is_home': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'languages': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'limit_visibility_in_menu': ('django.db.models.fields.SmallIntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), + 'login_required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'navigation_extenders': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '80', 'null': 'True', 'blank': 'True'}), + 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['cms.Page']"}), + 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'placeholders': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['cms.Placeholder']", 'symmetrical': 'False'}), + 'publication_date': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'publication_end_date': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'publisher_is_draft': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), + 'publisher_public': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'publisher_draft'", 'unique': 'True', 'null': 'True', 'to': "orm['cms.Page']"}), + 'reverse_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '40', 'null': 'True', 'blank': 'True'}), + 'revision_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'site': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'djangocms_pages'", 'to': u"orm['sites.Site']"}), + 'soft_root': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'template': ('django.db.models.fields.CharField', [], {'default': "'INHERIT'", 'max_length': '100'}), + 'xframe_options': ('django.db.models.fields.IntegerField', [], {'default': '0'}) + }, + 'cms.placeholder': { + 'Meta': {'object_name': 'Placeholder'}, + 'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slot': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}) + }, + u'cmsplugin_filer_link.filerlinkplugin': { + 'Meta': {'object_name': 'FilerLinkPlugin', '_ormbases': ['cms.CMSPlugin']}, + u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}), + 'file': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['filer.File']", 'null': 'True', 'blank': 'True'}), + 'link_style': ('django.db.models.fields.CharField', [], {'default': "' '", 'max_length': '255'}), + 'mailto': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'new_window': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'page_link': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Page']", 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'filer.file': { + 'Meta': {'object_name': 'File'}, + '_file_size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'folder': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'all_files'", 'null': 'True', 'to': u"orm['filer.Folder']"}), + 'has_all_mandatory_data': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), + 'original_filename': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'owned_files'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_filer.file_set+'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}), + 'sha1': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '40', 'blank': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + u'filer.folder': { + 'Meta': {'ordering': "(u'name',)", 'unique_together': "((u'parent', u'name'),)", 'object_name': 'Folder'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + u'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + u'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'filer_owned_folders'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "u'children'", 'null': 'True', 'to': u"orm['filer.Folder']"}), + u'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + u'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + u'sites.site': { + 'Meta': {'ordering': "(u'domain',)", 'object_name': 'Site', 'db_table': "u'django_site'"}, + 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + } + } + + complete_apps = ['cmsplugin_filer_link'] \ No newline at end of file