Merge branch 'master' into vi-ar

ciudadanointeligente · Oct 16, 2013 · 1d36d87 · 1d36d87
2 parents d72a42b + 750c9cc
commit 1d36d87
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/elections/models.py b/elections/models.py
@@ -60,7 +60,8 @@ def automatically_create_election(sender, instance, created, **kwargs):
 	            )
 
 		if getattr(settings, 'USE_POPIT', True):
-			popit_api_instance_url = settings.POPIT_API_URL% ( election.slug)
+			short_slug = hex(hash(election.slug))
+			popit_api_instance_url = settings.POPIT_API_URL% ( short_slug)
 
 			popit_api_instance = PopitApiInstance.objects.create(
 				url = popit_api_instance_url

diff --git a/elections/tests/candideitorg_popit_tests.py b/elections/tests/candideitorg_popit_tests.py
@@ -141,7 +141,9 @@ def test_it_creates_a_popit_API_client(self):
 
         api_instance = can_election.election.popit_api_instance
 
-        expected_url = settings.POPIT_API_URL % ( can_election.election.slug )
+        short_slug = hex(hash(can_election.election.slug))
+
+        expected_url = settings.POPIT_API_URL % ( short_slug )
         self.assertEquals(api_instance.url, expected_url)