From 4ada2d2282f1eec864c5026cf10d6491a84c565b Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Thu, 26 Apr 2012 10:25:54 -0400 Subject: [PATCH] =?utf8?q?[#2830]=20Bugfix=20sur=20les=20=C3=A9v=C3=A8nement?= =?utf8?q?s=20de=20l'agenda?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- auf_savoirs_en_partage/savoirs/models.py | 4 +- buildout.cfg | 32 ++---------- versions.cfg | 83 ++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 30 deletions(-) create mode 100644 versions.cfg diff --git a/auf_savoirs_en_partage/savoirs/models.py b/auf_savoirs_en_partage/savoirs/models.py index b7503a7..1db522c 100644 --- a/auf_savoirs_en_partage/savoirs/models.py +++ b/auf_savoirs_en_partage/savoirs/models.py @@ -392,7 +392,9 @@ class Evenement(models.Model): type = models.CharField(max_length=255, choices=TYPE_CHOICES) adresse = models.TextField() ville = models.CharField(max_length=100) - pays = models.ForeignKey(Pays, null=True, related_name='evenements') + pays = models.ForeignKey( + Pays, to_field='code', null=True, related_name='evenements' + ) debut = models.DateTimeField(default=datetime.datetime.now) fin = models.DateTimeField(default=datetime.datetime.now) fuseau = models.CharField( diff --git a/buildout.cfg b/buildout.cfg index a1f427f..66bd2a7 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,5 +1,7 @@ [buildout] -newest = false +extends = versions.cfg +extensions = buildout-versions +buildout_versions_file = versions.cfg parts = django articles harvest sphinx_config alertes_courriel versions = versions find-links = @@ -12,7 +14,6 @@ find-links = http://pypi.auf.org/auf.django.references/ http://pypi.auf.org/auf.recipe.django/ http://pypi.auf.org/django-alphafilter/ - eggs = auf_references_client Babel @@ -74,30 +75,3 @@ template = sphinx.conf.py.in recipe = buildout_script template_dir = ${buildout:directory}/auf_savoirs_en_partage/scripts/ template = alertes_courriel.in - -[versions] -auf.recipe.django = 1.1 -django = 1.2.5 -auf_references_client = 0.4.9 -Babel = 0.9.5 -caldav = 0.1.12 -chardet = 1.0.1 -pytz = 2010l -feedparser = 4.1 -BeautifulSoup = 3.2.0 -django_compressor = 0.5.3 -django_pagination = 1.0.7 -django_sorting = 0.1 -django-roa = 2.6.2 -django-admin-tools = 0.3.0 -django-sphinx = 2.2.3 -django-flash = 1.7.2 -PyYAML = 3.09 -South = 0.7.3 -django_exportateur = 1.0 -python-dateutil = 1.5 -auf.django.admingroup = 0.3dev -auf.django.auth = 0.5.5dev -auf.django.references = 0.5 -django-alphafilter = 0.5.3auf4 -django-selectable = 0.2 diff --git a/versions.cfg b/versions.cfg new file mode 100644 index 0000000..3840d66 --- /dev/null +++ b/versions.cfg @@ -0,0 +1,83 @@ +[versions] +auf.recipe.django = 1.7 +django = 1.2.5 +auf_references_client = 0.4.9 +Babel = 0.9.5 +caldav = 0.1.12 +chardet = 1.0.1 +pytz = 2010l +feedparser = 4.1 +BeautifulSoup = 3.2.0 +django_compressor = 0.5.3 +django_pagination = 1.0.7 +django_sorting = 0.1 +django-roa = 2.6.2 +django-admin-tools = 0.3.0 +django-sphinx = 2.2.3 +django-flash = 1.7.2 +PyYAML = 3.09 +South = 0.7.3 +django_exportateur = 1.0 +python-dateutil = 1.5 +auf.django.admingroup = 0.3dev +auf.django.auth = 0.5.5dev +auf.django.references = 0.5 +django-alphafilter = 0.5.3auf4 +django-selectable = 0.2 + + +# Added by Buildout Versions at 2012-04-26 10:19:09.922639 +auf-references-client = 0.4.9 +buildout-script = 0.2a1 +buildout-versions = 1.7 +django-appconf = 0.5 +django-compressor = 1.1.2 +django-debug-toolbar = 0.9.4 +django-exportateur = 1.0 +django-pagination = 1.0.7 +django-sorting = 0.1 +djangorecipe = 1.1.2 +markdown2 = 1.4.0 +simplejson = 2.5.0 + +# Required by: +# auf-references-client==0.4.9 +auf-references-modeles = 0.6.5 + +# Required by: +# caldav==0.1.12 +coverage = 3.5.1 + +# Required by: +# auf.django.auth==0.5.5dev +datamaster-modeles = 0.1.14 + +# Required by: +# auf-references-modeles==0.6.5 +django-historique = 1.0.1 + +# Required by: +# caldav==0.1.12 +nose = 1.1.2 + +# Required by: +# django-exportateur==1.0 +odfpy = 0.9.4 + +# Required by: +# auf-references-client==0.4.9 +python-memcached = 1.48 + +# Required by: +# caldav==0.1.12 +vobject = 0.8.1c + +# Required by: +# auf.recipe.django==1.7 +# djangorecipe==1.1.2 +zc.buildout = 1.5.2 + +# Required by: +# auf.recipe.django==1.7 +# djangorecipe==1.1.2 +zc.recipe.egg = 1.3.2 -- 1.7.10.4