# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1340379929 -7200
# Node ID 23b2b36e51181b7fbb9ff623420709fd01a4bc82
# Parent  ae8f8d549eed53d1771887ed997a14a2d26dc923# Parent  72aa63f8365dbcc4606aa066ecbdd91aabdbf7a9
Merge with 72aa63f8365dbcc4606aa066ecbdd91aabdbf7a9

diff -r ae8f8d549eed -r 23b2b36e5118 web/hdabo/models.py
--- a/web/hdabo/models.py	Fri Jun 22 14:13:23 2012 +0200
+++ b/web/hdabo/models.py	Fri Jun 22 17:45:29 2012 +0200
@@ -177,28 +177,28 @@
 
 class Datasheet(models.Model):
     hda_id = models.CharField(max_length=512, unique=True, blank=False, null=False)
-    author = models.ForeignKey(Author, null=True, blank=True)
-    organisation = models.ForeignKey(Organisation, null=True)
-    title = models.CharField(max_length=2048, unique=False, blank=False, null=False)
-    description = models.TextField(blank=True, null=True)
-    url = models.URLField(verify_exists=False, max_length=2048, blank=True, null=True)
-    domains = models.ManyToManyField(Domain, limit_choices_to={'school_period':Domain.DOMAIN_PERIOD_DICT[u'Global']}, related_name="datasheets", through="Datasheet_domains")
-    primary_periods = models.ManyToManyField(TimePeriod, limit_choices_to={'school_period':TimePeriod.TIME_PERIOD_DICT[u'Primaire']}, related_name="primary_periods_datasheets", through="Datasheet_primary_periods")
-    college_periods = models.ManyToManyField(TimePeriod, limit_choices_to={'school_period':TimePeriod.TIME_PERIOD_DICT[u'Collège']}, related_name="college_periods_datasheets", through="Datasheet_college_periods")
-    highschool_periods = models.ManyToManyField(TimePeriod, limit_choices_to={'school_period':TimePeriod.TIME_PERIOD_DICT[u'Lycée']}, related_name="highschool_periods_datasheets", through="Datasheet_highschool_periods")
-    primary_themes = models.ManyToManyField(Domain, limit_choices_to={'school_period':Domain.DOMAIN_PERIOD_DICT[u'Primaire']}, related_name="primary_themes_datasheets", through="Datasheet_primary_themes")
-    college_themes = models.ManyToManyField(Domain, limit_choices_to={'school_period':Domain.DOMAIN_PERIOD_DICT[u'Collège']}, related_name="college_themes_datasheets", through="Datasheet_college_themes")
-    highschool_themes = models.ManyToManyField(Domain, limit_choices_to={'school_period':Domain.DOMAIN_PERIOD_DICT[u'Lycée']}, related_name="highschool_themes_datasheets", through="Datasheet_highschool_themes")
-    town = models.ForeignKey(Location, null=True, blank=True)
-    format = models.ForeignKey(DocumentFormat, null=True, blank=True)
-    original_creation_date = models.DateField()
-    original_modification_date = models.DateField()
-    modification_datetime = models.DateTimeField(auto_now=True)
-    validation_date = models.DateTimeField(null=True, blank=True)
+    author = models.ForeignKey(Author, null=True, blank=True, serialize=False)
+    organisation = models.ForeignKey(Organisation, serialize=False, null=True)
+    title = models.CharField(max_length=2048, unique=False, blank=False, null=False, serialize=False)
+    description = models.TextField(blank=True, null=True, serialize=False)
+    url = models.URLField(verify_exists=False, max_length=2048, blank=True, null=True, serialize=False)
+    domains = models.ManyToManyField(Domain, limit_choices_to={'school_period':Domain.DOMAIN_PERIOD_DICT[u'Global']}, related_name="datasheets", through="Datasheet_domains", serialize=False)
+    primary_periods = models.ManyToManyField(TimePeriod, limit_choices_to={'school_period':TimePeriod.TIME_PERIOD_DICT[u'Primaire']}, related_name="primary_periods_datasheets", through="Datasheet_primary_periods", serialize=False)
+    college_periods = models.ManyToManyField(TimePeriod, limit_choices_to={'school_period':TimePeriod.TIME_PERIOD_DICT[u'Collège']}, related_name="college_periods_datasheets", through="Datasheet_college_periods", serialize=False)
+    highschool_periods = models.ManyToManyField(TimePeriod, limit_choices_to={'school_period':TimePeriod.TIME_PERIOD_DICT[u'Lycée']}, related_name="highschool_periods_datasheets", through="Datasheet_highschool_periods", serialize=False)
+    primary_themes = models.ManyToManyField(Domain, limit_choices_to={'school_period':Domain.DOMAIN_PERIOD_DICT[u'Primaire']}, related_name="primary_themes_datasheets", through="Datasheet_primary_themes", serialize=False)
+    college_themes = models.ManyToManyField(Domain, limit_choices_to={'school_period':Domain.DOMAIN_PERIOD_DICT[u'Collège']}, related_name="college_themes_datasheets", through="Datasheet_college_themes", serialize=False)
+    highschool_themes = models.ManyToManyField(Domain, limit_choices_to={'school_period':Domain.DOMAIN_PERIOD_DICT[u'Lycée']}, related_name="highschool_themes_datasheets", through="Datasheet_highschool_themes", serialize=False)
+    town = models.ForeignKey(Location, null=True, blank=True, serialize=False)
+    format = models.ForeignKey(DocumentFormat, null=True, blank=True, serialize=False)
+    original_creation_date = models.DateField(serialize=False)
+    original_modification_date = models.DateField(serialize=False)
+    modification_datetime = models.DateTimeField(auto_now=True, serialize=False)
+    validation_date = models.DateTimeField(null=True, blank=True, serialize=False)
     validated = models.BooleanField(default=False, db_index=True)
-    validator = models.ForeignKey(User, null=True, blank=True)
-    manual_order = models.BooleanField(default=False, db_index=True)
-    tags = models.ManyToManyField(Tag, through='TaggedSheet')
+    validator = models.ForeignKey(User, null=True, blank=True, serialize=False)
+    manual_order = models.BooleanField(default=False, db_index=True, serialize=False)
+    tags = models.ManyToManyField(Tag, through='TaggedSheet', serialize=False)
     
     def natural_key(self):
         return self.hda_id