ferme #338, cablage des actualite a la source + admin & refactoring model

diff --git a/auf_savoirs_en_partage/savoirs/admin.py b/auf_savoirs_en_partage/savoirs/admin.py
index 6159888..7ee1ec0 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/admin.py
+++ b/auf_savoirs_en_partage/savoirs/admin.py
@@ -237,7 +237,7 @@ admin.site.register(User, UserProfileAdmin)
 
 class ActualiteAdmin(admin.ModelAdmin):
     list_filter = ('visible',)
-    list_display = ('titre', 'date', 'visible')
+    list_display = ('titre', 'source', 'date', 'visible')
     actions = ['rendre_visible', 'rendre_invisible']
 
     # actions

diff --git a/auf_savoirs_en_partage/savoirs/models.py b/auf_savoirs_en_partage/savoirs/models.py
index d0d4980..d042724 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/models.py
+++ b/auf_savoirs_en_partage/savoirs/models.py
@@ -23,6 +23,9 @@ class Discipline(models.Model):
 class SourceActualite(models.Model):
     nom = models.CharField(max_length=255)
     url = models.CharField(max_length=255)
+    
+    def __unicode__(self,):
+        return u"%s" % self.nom
 
 class Actualite(models.Model):
     id = models.AutoField(primary_key=True, db_column='id_actualite')
@@ -32,6 +35,7 @@ class Actualite(models.Model):
     date = models.DateField(db_column='date_actualite')
     visible = models.BooleanField(db_column='visible_actualite', default = False)
     ancienid = models.IntegerField(db_column='ancienId_actualite', blank = True, null = True)
+    source = models.ForeignKey(SourceActualite, blank = True, null = True)
 
     def __unicode__ (self):
         return "%s" % (self.titre)

diff --git a/auf_savoirs_en_partage/scripts/articles.in b/auf_savoirs_en_partage/scripts/articles.in
index c2f9494..3cc4bd3 100644 (file)
--- a/auf_savoirs_en_partage/scripts/articles.in
+++ b/auf_savoirs_en_partage/scripts/articles.in
@@ -16,9 +16,9 @@ from django.conf import settings
 from savoirs.models import SourceActualite, Actualite
 import feedparser, datetime
 
-sources = [x.url for x in SourceActualite.objects.all()]
-for url in sources:
-    d = feedparser.parse(url)
+sources = SourceActualite.objects.all()
+for src in sources:
+    d = feedparser.parse(src.url)
     for entry in d.entries:
         if len(Actualite.objects.filter(url = entry.link)) == 0:
             print entry.updated_parsed
@@ -30,5 +30,6 @@ for url in sources:
                           url = entry.link,
                           date = date,
                           visible = False,
+                          source = src,
                           ancienid = 0)
             print a.save()

diff --git a/auf_savoirs_en_partage/templates/savoirs/index.html b/auf_savoirs_en_partage/templates/savoirs/index.html
index 7965b31..9fc51be 100644 (file)
--- a/auf_savoirs_en_partage/templates/savoirs/index.html
+++ b/auf_savoirs_en_partage/templates/savoirs/index.html
@@ -11,6 +11,9 @@
             <li class="clearfix">
             <span class="la-date">{{ article.date|date:"d F Y" }}</span>
             <a href="{{ article.url }}" class="le-titre">{{ article.titre }}</a>
+            {% if article.source %}
+            <span class="la-date">source: {{ article.source.nom }}</span>
+            {% endif %}
             {% comment %}
             <span class="le-resume">{{ article.texte }} -&nbsp;<a href="{{ article.url }}">Lire</a></span>
             {% endcomment %}