Обновление версий в зависимостях и правка сопутствующих багов

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,
+        ),
+    ]

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,

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,
+        ),
+    ]

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.')

packages/blog/templates/blog/post_detail.html

@@ -13,11 +13,11 @@
     </ul>
 {% endblock breadcrumb %}
 
-{% block content_blog %}{% spaceless %}
+{% block content_blog %}
 <article id="post-{{ post.slug }}" class="post-item post-detail">
     <content>
         <header>
-            <h1>{% render_model post "title" %}</h1>
+            <h1>{{ post.title }}</h1>
             <p class="date">{{ post.date_published|date:"DATE_FORMAT" }}</p>
         </header>
         {% if post.main_image_id %}
@@ -26,9 +26,9 @@
             <img src="{{ thumb.url }}" alt="{{ post.main_image.default_alt_text }}" width="{{ thumb.width }}" height="{{ thumb.height }}" />
         </div>
         {% endif %}
-        {% endspaceless %}
 
-        <div class="blog-content">{% render_model post "abstract" %}</div>
+
+        <div class="blog-content">{{ post.abstract|safe }}</div>
     </content>
     <side>
         <author>

packages/djangocms_forms/templates/djangocms_forms/form_template/default.html

@@ -93,13 +93,4 @@ var form = {
 	</div>
 </div>
 
-{% addtoblock "js" %}
-	<script src="{% static 'js/djangocms_forms/libs/jquery.form.min.js' %}"></script>
-	<script src="{% static 'js/djangocms_forms/djangocms_forms.js' %}"></script>
-	<script type="application/javascript">
-		$(function() {
-           $('.forms').djangocms_forms();
-		});
-	</script>
-{% endaddtoblock %}
 

requirements/common.txt

@@ -1,24 +1,24 @@
 aldryn-apphooks-config==0.2.6
-aldryn-boilerplates==0.7.3
+aldryn-boilerplates==0.7.4
-aldryn-bootstrap3==0.5.2
+aldryn-bootstrap3==1.1.2            # Up: 1.04.2017
-aldryn-common==0.1.4
+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-appconf==1.0.2
-django-appdata==0.1.4
+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==1.3.2
-django-meta-mixin==0.2.1
+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

trademark/migrations/0002_nice_glyph.py

@@ -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,
-        ),
-    ]