Merge lp:~daker/loco-team-portal/fix.planet-1 into lp:loco-team-portal

[Adnane Belmadiaf]

Change the feed importer to include the whole article with html

Ex : http://i.imgur.com/SFw0j.png

[lp:~daker/loco-team-portal/fix.planet-1]

579. By Adnane Belmadiaf on 2012-12-12

Added striptags to remove unwanted content

580. By Adnane Belmadiaf on 2012-12-12

Reverted back refresh command

581. By Adnane Belmadiaf on 2012-12-12

Reverted the default value of last_updated field

582. By Adnane Belmadiaf on 2012-12-12

Fix var name

=== modified file 'Vagrantfile'
--- Vagrantfile	2012-11-26 00:02:28 +0000
+++ Vagrantfile	2012-12-12 23:09:21 +0000
@@ -3,9 +3,6 @@
 
 Vagrant::Config.run do |ltp|
 
-    #sshconf = "#{ENV['HOME']}/.ssh/"
-    #bzrconf = "#{ENV['HOME']}/.bazaar/"
-
     ltp.vm.box = "ltp-devserver"
     ltp.vm.box_url = "http://files.vagrantup.com/precise32.box"
     ltp.vm.forward_port 8000, 8000
@@ -15,9 +12,7 @@
     ltp.ssh.max_tries = 50
     ltp.ssh.timeout = 300
 
-    ltp.vm.share_folder("v-root", "/home/vagrant/ltp", ".")
-    #ltp.vm.share_folder("v-ssh", "/home/vagrant/.host-ssh", sshconf)
-    #ltp.vm.share_folder("v-bzr", "/home/vagrant/.bazaar", bzrconf)
+    ltp.vm.share_folder("v-root", "/home/vagrant/ltp", ".", :nfs => true)
 
     ltp.vm.provision :puppet do |puppet|
         puppet.manifests_path = "puppet/manifests"

=== added file 'loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py'
--- loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py	1970-01-01 00:00:00 +0000
+++ loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py	2012-12-12 23:09:21 +0000
@@ -0,0 +1,153 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Deleting field 'article.snippet'
+        db.delete_column('articles_article', 'snippet')
+
+        # Adding field 'Article.content'
+        db.add_column('articles_article', 'content', self.gf('django.db.models.fields.TextField')(null=True, blank=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Adding field 'article.snippet'
+        db.add_column('articles_article', 'snippet', self.gf('django.db.models.fields.CharField')(max_length=512, null=True, blank=True), keep_default=False)
+
+        # Deleting field 'Article.content'
+        db.delete_column('articles_article', 'content')
+
+
+    models = {
+        'articles.article': {
+            'Meta': {'ordering': "['-imported', '-published']", 'object_name': 'Article'},
+            'author': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'imported': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'link': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'published': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['articles.Feed']", 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'uid': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        'articles.feed': {
+            'Meta': {'ordering': "('title',)", 'object_name': 'Feed'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1970, 1, 1, 0, 0)'}),
+            'team': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Team']", 'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'})
+        },
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'teams.continent': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
+        },
+        'teams.country': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
+            'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
+        },
+        'teams.language': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Language'},
+            'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
+        },
+        'teams.team': {
+            'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
+            'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
+            'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
+            'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
+            'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}),
+            'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
+            'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
+            'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+            'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'userprofiles.userprofile': {
+            'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
+            'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
+            'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
+            'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['articles']

=== modified file 'loco_directory/articles/models.py'
--- loco_directory/articles/models.py	2012-06-01 22:28:09 +0000
+++ loco_directory/articles/models.py	2012-12-12 23:09:21 +0000
@@ -6,7 +6,6 @@
 import urllib2
 
 from django.db import models
-from django.utils.html import strip_tags
 from django.conf import settings
 
 from teams.models import Team
@@ -62,7 +61,6 @@
         if not data or not hasattr(data, 'entries') or len(data.entries) == 0:
             # No new entries for this feed
             return
-
         now = datetime.datetime.now()
         existing_articles = set(list(Article.objects.filter(source=self).values_list('uid', flat=True)))
         returned_articles = set([])
@@ -86,9 +84,9 @@
                     imp_date = now
 
                 if hasattr(entry, 'content'):
-                    snippet = entry.content[0].value
+                    content = entry.content[0].value
                 else:
-                    snippet = entry.get('description', '')
+                    content = entry.get('description', '')
 
                 article = Article(
                     source=self,
@@ -98,7 +96,7 @@
                     imported=imp_date,
                     title=entry.get('title', '')[:128],
                     link=entry.get('link', None),
-                    snippet=strip_tags(snippet)[:512],
+                    content=content,
                 )
                 article.save()
 
@@ -114,7 +112,7 @@
     imported = models.DateTimeField(null=True, blank=True)
     link = models.URLField(max_length=1024, null=True, blank=True)
     title = models.CharField(max_length=128, null=True, blank=True)
-    snippet = models.CharField(max_length=512, null=True, blank=True)
+    content = models.TextField(null=True, blank=True)
 
     class Meta:
         ordering = ['-imported', '-published', ]

=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html	2012-09-25 21:01:12 +0000
+++ loco_directory/templates/index.html	2012-12-12 23:09:21 +0000
@@ -10,7 +10,7 @@
         <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/twidenash.css" />
         <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/continents.css" />
         <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
-        <script type="text/javascript"> 
+        <script type="text/javascript">
         //<![CDATA[
             $(function() {
                 $('.twidenash').twidenash( {
@@ -35,7 +35,7 @@
         <li id="southamerica">
        	<a href="{% url team-list %}#South%20America">
         </a>
-        </li>    
+        </li>
         <li id="asia">
         <a href="{% url team-list %}#Asia">
         </a>
@@ -51,7 +51,7 @@
         <li id="europe">
         <a href="{% url team-list %}#Europe">
         </a>
-        </li>    
+        </li>
     </ul>
     <br />
     <p style="text-align: center; font-weight: bold;">{% trans "Click on your continent to find teams near you." %}</p>
@@ -63,11 +63,10 @@
     {% for article in articles %}
         <article class="blog-entry">
             {% if article.source.team %}
-                <img class="blog-entry-image" src="{{ article.source.team.mugshot_url }}" /> 
+                <img class="blog-entry-image" src="{{ article.source.team.mugshot_url }}" />
             {% else %}
                 {% if article.source.user %}
-                 <img class="blog-entry-image" src="{{ article.source.user.mugshot }}" /> 
-
+                 <img class="blog-entry-image" src="{{ article.source.user.mugshot }}" />
                 {% endif %}
             {% endif %}
             <h4 class="blog-entry-title"><a href="{{ article.link }}" target="_blank">{{ article.title }}</a></h4>
@@ -77,14 +76,15 @@
                 {% endif %}
                 {% if article.source.user %}
                     {% if article.source.team %}, {% endif %}
-                    <a class="user" href="http://launchpad.net/~{{ article.source.user.user.username }}" target="_blank">{{ article.source.user }}</a>
+                    <a class="user" href="{% url profile-detail article.source.user.user.username %}" target="_blank">{{ article.source.user }}</a>
                 {% endif %}
             </div>
 
             <div class="blog-entry-text">
-                <p>{{ article.snippet|safe }} ... </p>
-                <p class="more"><a href="{{ article.link }}" target="_blank">{% trans 'Read More' %} ›</a>
-</p>
+                <p>{{ article.content|safe|striptags|truncatewords_html:100 }}</p>
+                <p class="more">
+                    <a href="{{ article.link }}" target="_blank">{% trans 'Read More' %} ›</a>
+                </p>
             </div>
         </article>
     {% endfor %}