Merge lp:~andrewsomething/dat-overview/new_contacted_logic into lp:dat-overview

[Andrew Starr-Bochicchio]

This branch adds the comment-style system for tracking contacts. It also
provides some optimization of the queries used to generate the views making
things a bit snappier.

[Bhavani Shankar (bhavi)]

Works great here! Awesome stuff again!

Thanks Andrew!

Regards
Bhavani

[Daniel Holbach (dholbach)]

That's excellent work! :)

review: Approve

=== modified file 'overview/local_settings.py.sample'
--- overview/local_settings.py.sample	2013-04-06 18:45:17 +0000
+++ overview/local_settings.py.sample	2013-06-23 19:42:22 +0000
@@ -18,5 +18,7 @@
     }
 }
 
-
-
+# Uncomment to use django debug_toolbar. Requires: python-django-ebug-toolbar
+#DEBUG_MIDDLEWARE_CLASSES = ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+#DEBUG_APPS =  ('debug_toolbar',)
+#INTERNAL_IPS = ('127.0.0.1',)
 
=== modified file 'overview/media/css/base.css'
--- overview/media/css/base.css	2013-06-18 23:57:17 +0000
+++ overview/media/css/base.css	2013-06-23 19:42:22 +0000
@@ -364,6 +364,29 @@
   box-shadow: 1px 1px 5px #CCC;
 }
 
+#comment{
+  max-width: 600px;
+  border-radius: 3px;
+  border: 1px solid #CCC;
+  padding: 8px;
+  font-weight: 200;
+  font-size: 15px;
+  font-family: Ubuntu;
+  box-shadow: 1px 1px 5px #CCC;
+  position: relative;
+}
+
+#comment-details{
+    padding-left:275px;
+}
+
+#comment h3{
+    position: absolute;
+    bottom: 0;
+    right: 5px;
+    color:#A9A9A9;
+}
+
 .legend{
     float:right;
 }
@@ -380,3 +403,7 @@
     min-height: 304px;
     background-repeat: no-repeat, repeat;
 }
+
+#id_honeypot {
+    display: none;
+}
 
=== modified file 'overview/settings.py'
--- overview/settings.py	2013-06-10 16:42:05 +0000
+++ overview/settings.py	2013-06-23 19:42:22 +0000
@@ -121,6 +121,7 @@
     'django.contrib.staticfiles',
     'django_openid_auth',
     'django.contrib.admin',
+    'django.contrib.comments',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'uploads',
@@ -187,7 +188,12 @@
     }
 }
 
+
+DEBUG_APPS = ()
+DEBUG_MIDDLEWARE_CLASSES = ()
 try:
     from local_settings import *
+    INSTALLED_APPS += DEBUG_APPS
+    MIDDLEWARE_CLASSES += DEBUG_MIDDLEWARE_CLASSES
 except ImportError:
     logging.warning("No local_settings.py were found. See INSTALL for instructions.")
 
=== modified file 'overview/templates/first_timers.html'
--- overview/templates/first_timers.html	2013-06-19 20:56:21 +0000
+++ overview/templates/first_timers.html	2013-06-23 19:42:22 +0000
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load custom_tags %}
 
 {% block content %}
 
@@ -29,8 +30,9 @@
         {% for i in output|dictsortreversed:"p.first_upload.timestamp" %}
             {% if 'saucy' in i.p.first_upload.release %}
             <tr class='{{ i.color }}'>
-                <td>{% if i.p.contacted %}
-                    <center>✓</center>{% endif %}
+                <td>{% if i.p|recent_contact %}
+                        <center>✓</center>
+                    {% endif %}
                 </td>
                 <td><a href="{{ i.p.lpid }}">{{ i.p.name }}</a></td>
                 <td>
@@ -68,8 +70,9 @@
         {% for i in output|dictsortreversed:"p.first_upload.timestamp" %}
             {% if 'raring' in i.p.first_upload.release %}
             <tr class='{{ i.color }}'>
-                <td>{% if i.p.contacted %}
-                    <center>✓</center>{% endif %}
+                <td>{% if i.p|recent_contact %}
+                        <center>✓</center>
+                    {% endif %}
                 </td>
                 <td><a href="{{ i.p.lpid }}">{{ i.p.name }}</a></td>
                 <td>
@@ -107,8 +110,9 @@
         {% for i in output|dictsortreversed:"p.first_upload.timestamp" %}
             {% if 'quantal' in i.p.first_upload.release %}
             <tr class='{{ i.color }}'>
-                <td>{% if i.p.contacted %}
-                    <center>✓</center>{% endif %}
+                <td>{% if i.p|recent_contact %}
+                        <center>✓</center>
+                    {% endif %}
                 </td>
                 <td><a href="{{ i.p.lpid }}">{{ i.p.name }}</a></td>
                 <td>
@@ -146,8 +150,9 @@
         {% for i in output|dictsortreversed:"p.first_upload.timestamp" %}
             {% if 'precise' in i.p.first_upload.release %}
             <tr class='{{ i.color }}'>
-                <td>{% if i.p.contacted %}
-                    <center>✓</center>{% endif %}
+                <td>{% if i.p|recent_contact %}
+                        <center>✓</center>
+                    {% endif %}
                 </td>
                 <td><a href="{{ i.p.lpid }}">{{ i.p.name }}</a></td>
                 <td>
 
=== modified file 'overview/templates/lost_contributors.html'
--- overview/templates/lost_contributors.html	2013-06-19 20:29:36 +0000
+++ overview/templates/lost_contributors.html	2013-06-23 19:42:22 +0000
@@ -18,7 +18,9 @@
     </tr>
 {% for p in lost_contributors|dictsortreversed:"last_upload.timestamp" %}
     <tr>
-        <td>{% if p.contacted %}<center>✓</center>{% endif %}</td>
+        <td>{% if p|recent_contact > p.last_upload.timestamp %}
+            <center>✓</center>{% endif %}
+        </td>
         <td>
             <a href="{{ p.lpid }}">{{ p.name }}</a>{% ubu_dev_img p.ubuntu_dev %}
         </td>
 
=== modified file 'overview/templates/person.html'
--- overview/templates/person.html	2013-06-21 20:24:21 +0000
+++ overview/templates/person.html	2013-06-23 19:42:22 +0000
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load custom_tags %}
+{% load comments %}
 
 {% block extrahead %}
 
@@ -46,24 +47,18 @@
         <li><b>Ubuntu Developer:</b> {{ person.ubuntu_dev|yesno:"Yes,No" }}</li>
         <li><b>Active:</b> {{ person.is_active|yesno:"Yes,No" }}</li>
         <li><b>Last Seen:</b> {{ person.last_upload.timestamp }}</li>
+        <li><b>Last Contact:</b> {{ person|recent_contact }}</li>
         <li><b>Total uploads:</b> {{ person.total_uploads }}</li>
         {% if ppu_candidates %}
         <li><b>PPU Candidates:</b> 
             {% for pkg in ppu_candidates %}
-            <a href="https://launchpad.net/ubuntu/+source/{{ pkg }}">{{ pkg }}</a>,</li>
+            <a href="https://launchpad.net/ubuntu/+source/{{ pkg }}">{{ pkg }}</a>, </li>
             {% endfor %}
         {% endif %}
+
     </ul>
 </div>
 
-<div id='contacted_form'>
-    <h3>Contacted?</h3>
-    <form action="#" method="post">{% csrf_token %}
-        {{ contacted.checkbox }}
-        <input type="submit" name='update_contacted' value="Save" />
-    </form>
-</div>
-
 <div id='whiteboard'>
     <h2>Whiteboard:</h2>
 
@@ -73,6 +68,43 @@
     </form>
 </div>
 
+<div id='contacts'>
+
+    <h2>Record contact:</h2>
+
+    <div id='comment-form'>
+        {% get_comment_form for person as form %}
+          <form action="{% comment_form_target %}" method="post">
+            {% csrf_token %}
+            {{ form.comment }}
+            {{ form.honeypot }}
+            {{ form.content_type }}
+            {{ form.object_pk }}
+            {{ form.timestamp }}
+            {{ form.security_hash }}
+            <input type="hidden" name="next" value="/contributors/{{ person.lpid }}#" />
+            <input type="submit" name="submit" value="Record contact">
+          </form>
+    </div>
+
+    <h2>Contacts:</h2>
+
+    {% get_comment_list for person as comment_list %}
+    {% for comment in comment_list reversed %}
+
+        <div id='comment'>
+            {{ comment.comment|linebreaks }}
+            <h3>#{{ forloop.revcounter }}</h3>
+        </div>
+
+        <div id='comment-details'>
+            by <a href="/users/{{ comment.user }}">{{ comment.user }}</a> on {{ comment.submit_date }}
+        </div>
+        <br>
+    {% endfor %}
+
+</div>
+
 <div id='uploads_per_release'>
     <h2>Uploads per release:</h2>
     <div id="uploads_per_release_chart"></div>
 
=== modified file 'overview/templates/potential_devs.html'
--- overview/templates/potential_devs.html	2013-06-19 20:29:36 +0000
+++ overview/templates/potential_devs.html	2013-06-23 19:42:22 +0000
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load custom_tags %}
 
 {% block content %}
 
@@ -15,9 +16,12 @@
         <th>Uploads</th>
         <th>Dates Active</th>
     </tr>
+
 {% for p in potential_devs|dictsortreversed:"first_upload.timestamp" %}
     <tr>
-        <td>{% if p.contacted %}<center>✓</center>{% endif %}</td>
+        <td>{% if p|recent_contact > p.fortieth %}
+            <center>✓</center>{% endif %}
+        </td>
         <td><a href="{{ p.lpid }}">{{ p.name }}</a></td>
         <td>{{ p.total_uploads }}</td>
         <td>{{ p.first_upload.timestamp|date:"SHORT_DATE_FORMAT" }} to {{ p.last_upload.timestamp|date:"SHORT_DATE_FORMAT" }}</td>
 
=== modified file 'overview/uploads/forms.py'
--- overview/uploads/forms.py	2013-04-23 18:32:37 +0000
+++ overview/uploads/forms.py	2013-06-23 19:42:22 +0000
@@ -3,9 +3,6 @@
 class NotesForm(forms.Form):
     notes = forms.CharField(widget = forms.widgets.Textarea(), required=False)
 
-class BooleanForm(forms.Form):
-    checkbox = forms.BooleanField(required=False)
-
 class EditContrib(forms.Form):
     lpid = forms.CharField(label='Launchpad ID: ', required=True)
     email = forms.EmailField(label='Email: ', required=True)
 
=== modified file 'overview/uploads/models.py'
--- overview/uploads/models.py	2013-06-10 16:42:05 +0000
+++ overview/uploads/models.py	2013-06-23 19:42:22 +0000
@@ -1,5 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
+from django.contrib.contenttypes import generic
+from django.contrib.comments.models import Comment
 
 class UDD(models.Model):
     connection_name='udd'
@@ -41,7 +43,7 @@
     last_upload = models.ForeignKey('Uploads', related_name='+')
     ubuntu_dev = models.BooleanField(default=False)
     notes = models.TextField(blank=True)
-    contacted  = models.BooleanField(default=False)
+    contacts = generic.GenericRelation(Comment, object_id_field="object_pk")
 
     class Meta:
         db_table = u'people'
 
=== modified file 'overview/uploads/templatetags/custom_tags.py'
--- overview/uploads/templatetags/custom_tags.py	2013-04-06 22:04:28 +0000
+++ overview/uploads/templatetags/custom_tags.py	2013-06-23 19:42:22 +0000
@@ -5,3 +5,8 @@
 @register.inclusion_tag('ubu_dev_flag_img.html')
 def ubu_dev_img(flag):
     return {'flag': flag}
+
[e-mail]
+def recent_contact(person):
+    if person.contacts.all():
+        return person.contacts.all().reverse()[0].submit_date
 
=== modified file 'overview/uploads/views.py'
--- overview/uploads/views.py	2013-06-21 20:24:21 +0000
+++ overview/uploads/views.py	2013-06-23 19:42:22 +0000
@@ -13,13 +13,17 @@
 from uploads.decorators import group_perm_required
 from uploads.models import Uploads, People, UserProfile
 from django.contrib.auth.models import User
-from uploads.forms import NotesForm, BooleanForm, EditContrib
+from uploads.forms import NotesForm, EditContrib
+
+from django.dispatch import receiver
+from django.contrib.comments.signals import comment_was_posted
 
 
 @group_perm_required()
 def first_timers(request):
     output = []
-    for p in People.objects.all():
+    for p in People.objects.all().prefetch_related("first_upload"
+                                ).prefetch_related("last_upload"):
         if p.total_uploads < 5:
             color = "lt5"
         if p.total_uploads >= 5 and p.total_uploads < 10:
@@ -41,21 +45,8 @@
     person = get_object_or_404(People, lpid=lpid)
     uploads = Uploads.objects.filter(lpid_changer=lpid)
     recent_uploads = uploads.order_by('timestamp').reverse()[0:10]
-    uploads_per_release = OrderedDict([])
-    for d in UbuntuDistroInfo().all:
-        release_uploads = len(Uploads.objects.filter(lpid_changer=lpid).filter(release__icontains=d))
-        if uploads_per_release or release_uploads > 0:
-            uploads_per_release[d] = release_uploads
-    packages = []
-    ppu_candidates = []
-    for ul in uploads:
-        packages += [ul.package]
-    appearances = defaultdict(int)
-    for curr in packages:
-        appearances[curr] += 1
-    for pkg in appearances:
-        if appearances[pkg] > 5:
-            ppu_candidates += [pkg]
+    uploads_per_release = get_uploads_per_release(lpid)
+    ppu_candidates = get_ppu_candidates(uploads)
     if request.method == 'POST':
         if 'save_notes' in request.POST:
             notes_form = NotesForm(request.POST)
@@ -67,56 +58,75 @@
                 log_action(person, change_message, request.user.pk)
                 messages.success(request, 'Change successfully saved...')
                 return HttpResponseRedirect('#')
-        elif 'update_contacted' in request.POST:
-            contacted = BooleanForm(request.POST)
-            notes_form = NotesForm(initial={'notes': person.notes})
-            if contacted.is_valid():
-                person.contacted = contacted.cleaned_data['checkbox']
-                person.save()
-                change_message = "Marked %s as contacted." % person.name
-                log_action(person, change_message, request.user.pk)
-                messages.success(request, 'Change successfully saved...')
-                return HttpResponseRedirect('#')
     else:
         notes_form = NotesForm(initial={'notes': person.notes})
-        contacted = BooleanForm(initial={'checkbox': person.contacted})
     return render(request, 'person.html', {'person': person,
                                            'recent_uploads': recent_uploads,
                                            'ppu_candidates': ppu_candidates,
                                            'notes_form': notes_form,
-                                           'contacted': contacted,
-                                           'uploads_per_release': uploads_per_release})
+                                           'uploads_per_release':
+                                                uploads_per_release})
+
+
+def get_ppu_candidates(uploads):
+    """
+    Takes an Uploads object filtered by lpid_changer and returns
+    a list of package that were uploaded by a contributor more than
+    five times.
+    """
+    packages = uploads.values_list('package', flat=True)
+    ppu_candidates = []
+    appearances = defaultdict(int)
+    for curr in packages:
+        appearances[curr] += 1
+    for pkg in appearances:
+        if appearances[pkg] > 5:
+            ppu_candidates += [pkg]
+    return ppu_candidates
+
+
+def get_uploads_per_release(lpid):
+    """
+    Takes an lpid and returns an ordered dict of uploads per release.
+    """
+    uploads_per_release = OrderedDict([])
+    for d in UbuntuDistroInfo().all:
+        release_uploads = len(Uploads.objects.filter(
+            lpid_changer=lpid).filter(release__icontains=d))
+        if uploads_per_release or release_uploads > 0:
+            uploads_per_release[d] = release_uploads
+    return uploads_per_release
 
 
 @group_perm_required()
 def edit_person(request, lpid):
     person = get_object_or_404(People, lpid=lpid)
     if request.method == 'POST':
-        if request.method == 'POST':
-            person_form = EditContrib(request.POST)
-            if person_form.is_valid():
-                new_lpid = person_form.cleaned_data['lpid']
-                person.email = person_form.cleaned_data['email']
-                person.lpid = new_lpid
-                person.save()
-                if lpid is not new_lpid:
-                    uploads = Uploads.objects.filter(lpid_changer=lpid)
-                    uploads.update(lpid_changer = new_lpid)
-                change_message = "Updated %s's details." % person.name
-                log_action(person, change_message, request.user.pk)
-                messages.success(request, 'Change successfully saved...')
-                return HttpResponseRedirect('/contributors/{}'.format(new_lpid))
+        person_form = EditContrib(request.POST)
+        if person_form.is_valid():
+            new_lpid = person_form.cleaned_data['lpid']
+            person.email = person_form.cleaned_data['email']
+            person.lpid = new_lpid
+            person.save()
+            if lpid is not new_lpid:
+                uploads = Uploads.objects.filter(lpid_changer=lpid)
+                uploads.update(lpid_changer=new_lpid)
+            change_message = "Updated %s's details." % person.name
+            log_action(person, change_message, request.user.pk)
+            messages.success(request, 'Change successfully saved...')
+            return HttpResponseRedirect('/contributors/{}'.format(new_lpid))
     else:
         person_form = EditContrib(initial={'lpid': lpid,
                                            'email': person.email})
     return render(request, 'edit_person.html', {'person': person,
                                                 'person_form': person_form})
 
+
 @group_perm_required()
 def recent_contributors(request):
     recent_contributors = []
-    for p in People.objects.all():
-        cutoff_date = timezone.now() - timedelta(days=2 * 30)
+    cutoff_date = timezone.now() - timedelta(days=2 * 30)
+    for p in People.objects.all().prefetch_related("last_upload"):
         if p.last_upload.timestamp > cutoff_date:
             recent_contributors += [p]
     return render(request, 'recent_contributors.html',
@@ -126,9 +136,9 @@
 @group_perm_required()
 def lost_contributors(request):
     lost_contributors = []
-    for p in People.objects.all():
-        one_year = timezone.now() - timedelta(days=365)
-        two_months = timezone.now() - timedelta(days=2 * 30)
+    one_year = timezone.now() - timedelta(days=365)
+    two_months = timezone.now() - timedelta(days=2 * 30)
+    for p in People.objects.all().prefetch_related('last_upload'):
         ul_date = p.last_upload.timestamp
         if  ul_date > one_year and ul_date < two_months:
             lost_contributors += [p]
@@ -139,48 +149,63 @@
 @group_perm_required()
 def potential_devs(request):
     potential_devs = []
-    for p in People.objects.all():
-        six_months = timezone.now() - timedelta(days=6 * 30)
-        if ((p.first_upload.timestamp < six_months
-             and p.ubuntu_dev is not True
-             and p.total_uploads >= 40
-             and p.is_active is True)):
-                potential_devs += [p]
+    cutoff_upload = {}
+    six_months = timezone.now() - timedelta(days=6 * 30)
+    for p in People.objects.filter(ubuntu_dev=False
+                          ).filter(total_uploads__gte=40
+                          ).filter(is_active=True
+                          ).prefetch_related("first_upload"
+                          ).prefetch_related("last_upload"
+                          ).filter(first_upload__timestamp__lte=six_months):
+            uploads = Uploads.objects.filter(lpid_changer=p.lpid)
+            p.fortieth = uploads.order_by("timestamp")[39].timestamp
+            potential_devs += [p]
     return render(request, 'potential_devs.html',
-                  {'potential_devs': potential_devs})
+                  {'potential_devs': potential_devs,
+                  'cutoff_upload': cutoff_upload})
+
 
 def log_action(object, change_message, user):
     LogEntry.objects.log_action(
-        user_id = user, 
-        content_type_id = ContentType.objects.get_for_model(object).pk,
-        object_id = object.pk,
-        object_repr = object.lpid,
-        change_message = change_message,
-        action_flag = ADDITION
+        user_id=user,
+        content_type_id=ContentType.objects.get_for_model(object).pk,
+        object_id=object.pk,
+        object_repr=object.lpid,
+        change_message=change_message,
+        action_flag=ADDITION
     )
 
+
 @group_perm_required()
 def user_profile(request, user):
     profile = User.objects.get(username=user).profile
     actions = LogEntry.objects.filter(user_id=profile.user_id)
-    edited_contribs = actions.order_by('object_repr').values_list("object_repr",
-                                                      flat=True).distinct()
-    return render(request, 'user_profile.html',{'profile': profile,
-                                                'actions': actions,
-                                                'edited_contribs': edited_contribs})
+    edited_contribs = actions.order_by('object_repr'
+                            ).values_list("object_repr",
+                                          flat=True).distinct()
+    return render(request, 'user_profile.html', {'profile': profile,
+                                                 'actions': actions,
+                                                 'edited_contribs':
+                                                      edited_contribs})
+
 
 def site_logout(request):
     logout(request)
     messages.success(request, 'Logged out successfully...')
     return HttpResponseRedirect('/')
 
+
 def access_denied(request, redirect):
-    messages.error(request, 'You do not have the correct permissions to view that page...')
+    messages.error(request, """
+        You do not have the correct permissions to view that page...
+        """)
     return HttpResponseRedirect(redirect)
 
+
 def index(request):
     return render(request, 'index.html', dashboard())
 
+
 def dashboard():
     first_timers = []
     experienced = []
@@ -189,21 +214,46 @@
     two_months = timezone.now() - timedelta(days=2 * 30)
     six_months = timezone.now() - timedelta(days=6 * 30)
     one_year = timezone.now() - timedelta(days=365)
-    for p in People.objects.all().order_by('last_upload__timestamp').reverse():
-        if (len(first_timers) < 20 and p.first_upload.timestamp > three_months
-                                 and p.contacted is False):
+    people = People.objects.all().prefetch_related("first_upload"
+                                ).prefetch_related("last_upload"
+                                ).select_related('contacts'
+                                ).order_by('last_upload__timestamp').reverse()
+    first_timers_qs = people.filter(first_upload__timestamp__gte=three_months)
+    experienced_qs = people.filter(ubuntu_dev=False
+                          ).filter(total_uploads__gte=40
+                          ).filter(is_active=True)
+    inactive_qs = people.filter(last_upload__timestamp__gt=one_year
+                       ).filter(last_upload__timestamp__lt=two_months
+                       ).filter(total_uploads__gte=5)
+    for p in first_timers_qs:
+        if (len(first_timers) < 20 and not p.contacts.all()):
             first_timers.append(p)
-        if (len(experienced) < 20 and p.first_upload.timestamp < six_months
-             and p.ubuntu_dev is not True
-             and p.total_uploads >= 40
-             and p.is_active is True
-             and p.contacted is False):
-               experienced.append(p)
-        if len(inactive) < 20:
-            ul_date = p.last_upload.timestamp
-            if (ul_date > one_year and ul_date < two_months 
-                and p.contacted is False and p.total_uploads >= 5):
-                  inactive.append(p)
+    for p in experienced_qs:
+        if p.contacts.all():
+            recent_c = p.contacts.all().reverse()[0].submit_date
+        else:
+            recent_c = None
+        if (len(experienced) < 20 and (recent_c is None or
+            recent_c < Uploads.objects.filter(lpid_changer=p.lpid
+                                     ).order_by("timestamp"
+                                     )[39].timestamp)):
+            experienced.append(p)
+    for p in inactive_qs:
+        if p.contacts.all():
+            recent_c = p.contacts.all().reverse()[0].submit_date
+        else:
+            recent_c = None
+        if len(inactive) < 20 and (recent_c is None or
+            recent_c < p.last_upload.timestamp):
+                inactive.append(p)
     return {'first_timers': first_timers,
             'experienced': experienced,
             'inactive': inactive}
+
+
+@receiver(comment_was_posted)
+def on_contact_saved(sender, comment=None, request=None, **kwargs):
+    person = People.objects.get(pk=comment.object_pk)
+    change_message = "Recorded a contact with %s." % person.name
+    log_action(person, change_message, comment.user.pk)
+    messages.success(request, 'Change successfully saved...')
 
=== modified file 'overview/urls.py'
--- overview/urls.py	2013-06-12 18:37:58 +0000
+++ overview/urls.py	2013-06-23 19:42:22 +0000
@@ -29,7 +29,8 @@
                                               name='potential_devs'),
     url(r'^contributors/(?P<lpid>.+)/edit', views.edit_person, name='edit_person'),
     url(r'^contributors/(?P<lpid>.+)', views.person_detail, name='person_detail'),
-    url(r'^users/(?P<user>.+)', views.user_profile, name='user_profile')
+    url(r'^users/(?P<user>.+)', views.user_profile, name='user_profile'),
+    url(r'^comments/', include('django.contrib.comments.urls'))
 )
 
 if settings.STATIC_SERVE: