Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django

diff --git a/auf_savoirs_en_partage/savoirs/lib/sep.py b/auf_savoirs_en_partage/savoirs/lib/sep.py
index 7a6aae3..482f54a 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/lib/sep.py
+++ b/auf_savoirs_en_partage/savoirs/lib/sep.py
@@ -156,7 +156,6 @@ class SEP:
              WHERE (%s) AND r.validated = 1 AND l.validated = 1 \
              GROUP BY r.id \
              HAVING score > 0 ORDER BY score DESC" % (m, m)
-        print q
         from django.db import connection, transaction
         cursor = connection.cursor()
         cursor.execute(q)

diff --git a/auf_savoirs_en_partage/savoirs/models.py b/auf_savoirs_en_partage/savoirs/models.py
index e75cc03..07193fa 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/models.py
+++ b/auf_savoirs_en_partage/savoirs/models.py
@@ -47,7 +47,7 @@ class Actualite(models.Model):
         ordering = ["-date",]
 
 class Evenement(models.Model):
-    uid = models.CharField(max_length = 255, default = None)
+    uid = models.CharField(max_length = 255, default = str(uuid.uuid1()))
     approuve = models.BooleanField(default = False)
     titre = models.CharField(max_length=255)
     discipline = models.ForeignKey('Discipline', related_name = "discipline",