Merge branch 'master' of github.com:ciudadanointeligente/votaintelige…

…nte-portal-electoral

popular_proposal/models.py

@@ -10,7 +10,7 @@
 from backend_citizen.models import Enrollment
 from django.contrib.sites.models import Site
 from autoslug import AutoSlugField
-import uuid
+from django.core.urlresolvers import reverse
 
 
 class NeedingModerationManager(models.Manager):
@@ -107,7 +107,7 @@ def __str__(self):
 @python_2_unicode_compatible
 class PopularProposal(models.Model):
     title = models.CharField(max_length=255, default='')
-    slug = AutoSlugField(populate_from='title', unique=True, default=uuid.uuid4)
+    slug = AutoSlugField(populate_from='title', unique=True)
     proposer = models.ForeignKey(User, related_name='proposals')
     area = models.ForeignKey(Area, related_name='proposals')
     data = PickledObjectField()
@@ -122,6 +122,9 @@ class PopularProposal(models.Model):
 
     def __str__(self):
         return self.title
+
+    def get_absolute_url(self):
+        return reverse('popular_proposals:detail', kwargs={'slug': self.slug})
 
 
 class Subscription(models.Model):

popular_proposal/tests/views_tests.py

@@ -22,6 +22,7 @@ def test_there_is_a_page_for_popular_proposal(self):
                                                           )
         # no need to be logged in
         url = reverse('popular_proposals:detail', kwargs={'slug': popular_proposal.slug})
+        self.assertEquals(popular_proposal.get_absolute_url(), url)
         response = self.client.get(url)
         self.assertEquals(response.status_code, 200)
         self.assertEqual(response.context['popular_proposal'], popular_proposal)

votai_general_theme/templates/mails/popular_proposal_accepted_body.html

@@ -10,6 +10,9 @@
 
 
 Puedes ver tu propuesta en el siguiente link:
+http://{{site.domain}}{{ temporary_data.created_proposal.get_absolute_url }}
+
+Y acá puedes ver la lista de todas las propuestas de {{area}}:
 http://{{site.domain}}{% url 'area' slug=area.id %}
 
 

votai_general_theme/templates/popular_proposal/detail.html

@@ -16,6 +16,8 @@
 });
 {% endblock extrajs %}
 
+{% block title %}{{popular_proposal.title}}{% endblock title%}
+
 {% block content %}
 {% include 'modal.html' with modalId='supportProposal' title='Apoya una propuesta' %}
 <div>
@@ -26,7 +28,7 @@
   <h1>{{popular_proposal.title}}</h1>
   <div class="text-right"><a href="{% url 'area' slug=popular_proposal.area.id %}" class="btn btn-primary btn-lg">{{popular_proposal.area}}</a></div>
 
-      <dl class="dl-horizontal">
+      <dl>
 
 
       {% for key, value in popular_proposal.data.items %}