@@ -134,9 +134,6 @@ class Snapshot(models.Model): if options.count() == 1: current = get_object_or_404(Charge,snapshot=self,name=slugs[0]) else: - print "Multiple charges found with the same slug" - for c in options: - print c.id,c.name,c.label raise "Oh No!!!" if len(slugs) == 1: law/models.py @@ -260,10 +260,23 @@ def edit_classification_index(request): def add_classification(request): f = AddClassificationForm(request.POST) snapshot = working_snapshot() + slug = slugify(request.POST['label'])[:50] + # need to check for duplicate slugs and fix + try: + ct = Classification.objects.get(name=slug) + # uh oh. there's already a charge with that slug + # need to come up with a relatively unique new one + # this is the most reasonable approach I can think of + slug = slug[:-3] + "%03d" % (Classification.objects.count() % 1000) + # any better ideas? + except Classification.DoesNotExist: + # that's good + pass + c = Classification.objects.create(snapshot=snapshot, label=request.POST['label'], description=request.POST['description'], - name=slugify(request.POST['label'])[:50], + name=slug, ) e = Event.objects.create(snapshot=snapshot, user=request.user, law/views.py 843b744312b2e47c3af7f122eb30acc6d08e75fc Anders Pearson anders@columbia.edu http://github.com/thraxil/ccdb/commit/9d72e9f7baf641e43c135237c858e23f75646f29 9d72e9f7baf641e43c135237c858e23f75646f29 2009-05-22T12:39:48-07:00 2009-05-22T12:39:48-07:00 try to avoid duplicate slugs on classifications 2642191b768d004abd26bea852b2658c8aa887f7 Anders Pearson anders@columbia.edu