From bfa2d76207d0fd085f9a51f298a202e452364027 Mon Sep 17 00:00:00 2001 From: Laville Augustin Date: Fri, 17 Jun 2016 14:25:15 +0200 Subject: [PATCH] Fix #3397 : corriges les incoherences du modele PublishableContent (#3475) --- .../migrations/0014_auto_20160331_0415.py | 29 +++++++++++++++++++ zds/tutorialv2/models/models_database.py | 9 ++---- 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 zds/tutorialv2/migrations/0014_auto_20160331_0415.py diff --git a/zds/tutorialv2/migrations/0014_auto_20160331_0415.py b/zds/tutorialv2/migrations/0014_auto_20160331_0415.py new file mode 100644 index 0000000000..78b5ee2534 --- /dev/null +++ b/zds/tutorialv2/migrations/0014_auto_20160331_0415.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tutorialv2', '0013_auto_20160320_0908'), + ] + + operations = [ + migrations.AlterField( + model_name='publishablecontent', + name='beta_topic', + field=models.ForeignKey(default=None, blank=True, to='forum.Topic', null=True, verbose_name=b'Sujet beta associ\xc3\xa9'), + ), + migrations.AlterField( + model_name='publishablecontent', + name='helps', + field=models.ManyToManyField(to='utils.HelpWriting', db_index=True, verbose_name=b'Aides', blank=True), + ), + migrations.AlterField( + model_name='publishablecontent', + name='source', + field=models.CharField(max_length=200, null=True, verbose_name=b'Source', blank=True), + ), + ] diff --git a/zds/tutorialv2/models/models_database.py b/zds/tutorialv2/models/models_database.py index a3224c635e..b4d29ee0c5 100644 --- a/zds/tutorialv2/models/models_database.py +++ b/zds/tutorialv2/models/models_database.py @@ -60,7 +60,7 @@ class Meta: title = models.CharField('Titre', max_length=80) slug = models.CharField('Slug', max_length=80) description = models.CharField('Description', max_length=200) - source = models.CharField('Source', max_length=200) + source = models.CharField('Source', max_length=200, blank=True, null=True) authors = models.ManyToManyField(User, verbose_name='Auteurs', db_index=True) old_pk = models.IntegerField(db_index=True, default=0) subcategory = models.ManyToManyField(SubCategory, @@ -93,17 +93,14 @@ class Meta: blank=True, null=True, max_length=80, db_index=True) sha_draft = models.CharField('Sha1 de la version de rédaction', blank=True, null=True, max_length=80, db_index=True) - beta_topic = models.ForeignKey(Topic, - verbose_name='Contenu associé', - default=None, - null=True) + beta_topic = models.ForeignKey(Topic, verbose_name='Sujet beta associé', default=None, blank=True, null=True) licence = models.ForeignKey(Licence, verbose_name='Licence', blank=True, null=True, db_index=True) # as of ZEP 12 this field is no longer the size but the type of content (article/tutorial) type = models.CharField(max_length=10, choices=TYPE_CHOICES, db_index=True) # zep03 field - helps = models.ManyToManyField(HelpWriting, verbose_name='Aides', db_index=True) + helps = models.ManyToManyField(HelpWriting, verbose_name='Aides', blank=True, db_index=True) relative_images_path = models.CharField( 'chemin relatif images',