From afefcfc5c0d7c60eb406640e7b6a53852a4bed49 Mon Sep 17 00:00:00 2001 From: Alexander Kondratyev Date: Mon, 3 Apr 2017 00:02:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=B2=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=8F=D1=85=20=D0=B8=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=81=D0=BE=D0=BF=D1=83=D1=82=D1=81=D1=82=D0=B2=D1=83?= =?UTF-8?q?=D1=8E=D1=89=D0=B8=D1=85=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0005_auto_20170401_2345.py | 28 ++++++++++++++++++ packages/aldryn_people/models.py | 6 ++-- .../migrations/0011_auto_20170401_2345.py | 20 +++++++++++++ packages/blog/models.py | 1 - packages/blog/templates/blog/post_detail.html | 8 ++--- .../form_template/default.html | 9 ------ requirements/common.txt | 29 +++++++++---------- trademark/migrations/0002_nice_glyph.py | 20 ------------- 8 files changed, 69 insertions(+), 52 deletions(-) create mode 100644 packages/aldryn_people/migrations/0005_auto_20170401_2345.py create mode 100644 packages/blog/migrations/0011_auto_20170401_2345.py delete mode 100644 trademark/migrations/0002_nice_glyph.py diff --git a/packages/aldryn_people/migrations/0005_auto_20170401_2345.py b/packages/aldryn_people/migrations/0005_auto_20170401_2345.py new file mode 100644 index 0000000..8f9f779 --- /dev/null +++ b/packages/aldryn_people/migrations/0005_auto_20170401_2345.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +from django.conf import settings +import aldryn_common.admin_fields.sortedm2m + + +class Migration(migrations.Migration): + + dependencies = [ + ('aldryn_people', '0004_auto_20150622_1606'), + ] + + operations = [ + migrations.AlterField( + model_name='peopleplugin', + name='people', + field=aldryn_common.admin_fields.sortedm2m.SortedM2MModelField(help_text=None, to='aldryn_people.Person', blank=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='person', + name='user', + field=models.OneToOneField(null=True, blank=True, to=settings.AUTH_USER_MODEL), + preserve_default=True, + ), + ] diff --git a/packages/aldryn_people/models.py b/packages/aldryn_people/models.py index d459336..a837a23 100644 --- a/packages/aldryn_people/models.py +++ b/packages/aldryn_people/models.py @@ -104,9 +104,9 @@ class Person(TranslatableModel): unique=True) vcard_enabled = models.BooleanField( verbose_name=_('enable vCard download'), default=True) - user = models.ForeignKey( + user = models.OneToOneField( getattr(settings, 'AUTH_USER_MODEL', 'auth.User'), - null=True, blank=True, unique=True) + null=True, blank=True) class Meta: verbose_name = _('Person') @@ -218,7 +218,7 @@ class BasePeoplePlugin(CMSPlugin): _('Style'), choices=STYLE_CHOICES, default=STYLE_CHOICES[0][0], max_length=50) people = aldryn_common.admin_fields.sortedm2m.SortedM2MModelField( - Person, blank=True, null=True) + Person, blank=True) group_by_group = models.BooleanField( verbose_name=_('group by group'), default=True, diff --git a/packages/blog/migrations/0011_auto_20170401_2345.py b/packages/blog/migrations/0011_auto_20170401_2345.py new file mode 100644 index 0000000..996f650 --- /dev/null +++ b/packages/blog/migrations/0011_auto_20170401_2345.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0010_auto_20170401_1032'), + ] + + operations = [ + migrations.AlterField( + model_name='post', + name='sites', + field=models.ManyToManyField(help_text='Select sites in which to show the post. If none is set it will be visible in all the configured sites.', to='sites.Site', verbose_name='Site(s)', blank=True), + preserve_default=True, + ), + ] diff --git a/packages/blog/models.py b/packages/blog/models.py index c63c1d0..e583401 100644 --- a/packages/blog/models.py +++ b/packages/blog/models.py @@ -107,7 +107,6 @@ class Post(ModelMeta, TranslatableModel): default=get_setting('ENABLE_COMMENTS') ) sites = models.ManyToManyField(Site, verbose_name=_(u'Site(s)'), blank=True, - null=True, help_text=_(u'Select sites in which to show the post. ' u'If none is set it will be ' u'visible in all the configured sites.') diff --git a/packages/blog/templates/blog/post_detail.html b/packages/blog/templates/blog/post_detail.html index df3d5ff..44f67ce 100644 --- a/packages/blog/templates/blog/post_detail.html +++ b/packages/blog/templates/blog/post_detail.html @@ -13,11 +13,11 @@ {% endblock breadcrumb %} -{% block content_blog %}{% spaceless %} +{% block content_blog %}
-

{% render_model post "title" %}

+

{{ post.title }}

{{ post.date_published|date:"DATE_FORMAT" }}

{% if post.main_image_id %} @@ -26,9 +26,9 @@ {{ post.main_image.default_alt_text }} {% endif %} - {% endspaceless %} -
{% render_model post "abstract" %}
+ +
{{ post.abstract|safe }}
 diff --git a/packages/djangocms_forms/templates/djangocms_forms/form_template/default.html b/packages/djangocms_forms/templates/djangocms_forms/form_template/default.html index fd8f9c1..198973d 100644 --- a/packages/djangocms_forms/templates/djangocms_forms/form_template/default.html +++ b/packages/djangocms_forms/templates/djangocms_forms/form_template/default.html @@ -93,13 +93,4 @@ var form = { -{% addtoblock "js" %} - - - -{% endaddtoblock %} diff --git a/requirements/common.txt b/requirements/common.txt index a9331f8..beae730 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -1,24 +1,24 @@ aldryn-apphooks-config==0.2.6 -aldryn-boilerplates==0.7.3 -aldryn-bootstrap3==0.5.2 -aldryn-common==0.1.4 +aldryn-boilerplates==0.7.4 +aldryn-bootstrap3==1.1.2 # Up: 1.04.2017 +aldryn-common==1.0.4 # Up: 1.04.2017 aldryn-translation-tools==0.2.1 -cmsplugin-filer==0.10.2 +cmsplugin-filer==1.0.1 dj-database-url==0.3.0 -Django==1.7.8 +Django==1.7.11 django-admin-enhancer==1.0.0 django-admin-extend==0.0.3 -django-appconf==1.0.1 -django-appdata==0.1.4 +django-appconf==1.0.2 +django-appdata==0.1.5 django-classy-tags==0.6.2 -django-cms==3.1.3 +django-cms==3.2.5 django-durationfield==0.5.2 django-easy-select2==1.3.3 -django-filer==0.9.12 +django-filer==1.1.1 django-formtools==1.0 django-ipware==1.1.1 -django-meta==0.3.1 -django-meta-mixin==0.2.1 +django-meta==1.3.2 +django-meta-mixin==0.3.0 django-mptt==0.7.4 django-multipleformwizard==0.2.16 django-parler==1.5.1 @@ -26,7 +26,7 @@ django-phonenumber-field==0.7.2 django-pipeline==1.6.12 django-polymorphic==0.7.2 django-reversion==1.9.3 -django-sekizai==0.8.2 +django-sekizai==0.10.0 Django-Select2==4.3.2 django-sortedm2m==1.0.2 django-taggit==0.17.3 @@ -38,13 +38,13 @@ djangocms-column==1.5 djangocms-file==0.1 djangocms-flash==0.2.0 djangocms-googlemap==0.3 -djangocms-inherit==0.1 +djangocms-inherit==0.1.1 djangocms-installer==0.8.1 djangocms-link==1.7.1 djangocms-picture==0.1 djangocms-style==1.5 djangocms-teaser==0.1 -djangocms-text-ckeditor==2.6.0 +djangocms-text-ckeditor==2.8.1 djangocms-video==0.1 easy-thumbnails==2.2 futures==3.0.3 @@ -63,7 +63,6 @@ pytz==2015.7 pyuca==1.1 requests==2.8.1 six==1.10.0 -South==1.0.2 sqlparse==0.1.18 tablib==0.10.0 tzlocal==1.2 diff --git a/trademark/migrations/0002_nice_glyph.py b/trademark/migrations/0002_nice_glyph.py deleted file mode 100644 index 0c15c20..0000000 --- a/trademark/migrations/0002_nice_glyph.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('trademark', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='nice', - name='glyph', - field=models.CharField(default='', max_length=255), - preserve_default=False, - ), - ]