Fix #527

cadasta/core/models.py

@@ -40,15 +40,15 @@ def save(self, *args, **kwargs):
                 self.name, max_length=max_length, allow_unicode=True
             )
 
-        orig = self.slug
+        orig_slug = self.slug
 
         if not self.id or self.__original_slug != self.slug:
             for x in itertools.count(1):
                 if not type(self).objects.filter(slug=self.slug).exists():
                     break
                 slug_length = max_length - int(math.log10(x)) - 2
-                orig = self.slug[:slug_length]
-                self.slug = '{}-{}'.format(orig, x)
+                trial_slug = orig_slug[:slug_length]
+                self.slug = '{}-{}'.format(trial_slug, x)
 
         self.__original_slug = self.slug
 

cadasta/core/tests/test_models.py

@@ -98,6 +98,15 @@ def test_create_with_duplicate_slug(self):
         assert instance1.slug != instance2.slug
         assert instance2.slug == 'test-name-1'
 
+    def test_duplicate_slug_100_times(self):
+        for i in range(0, 101):
+            instance = MySlugModel()
+            instance.name = ("Test Name")
+            instance.save()
+
+        assert MySlugModel.objects.count() == 101
+        assert instance.slug == 'test-name-100'
+
     def test_keep_slug(self):
         instance = MySlugModel()
         instance.name = 'Test Name'
@@ -136,17 +145,12 @@ def test_duplicate_slug_long_name(self):
         print(instance1.slug)
         print(instance2.slug)
 
-    def test_duplicate_slug_long_name_ten_times(self):
-        for i in range(0, 100):
+    def test_duplicate_slug_long_name_100_times(self):
+        for i in range(0, 101):
             instance = MySlugModel()
             instance.name = ('Very Long Name For The Purposes of Testing '
                              'That Slug Truncation Functions Correctly')
             instance.save()
 
-        instance = MySlugModel()
-        instance.name = ('Very Long Name For The Purposes of '
-                         'Testing That Slug Truncation Functions Correctly')
-        instance.save()
-
         assert MySlugModel.objects.count() == 101
         assert instance.slug[-4:] == '-100'