Merged in [8099] from rjsparks@nostrum.com:\n Use the name field from the materials upload form. Fixes ticket ietf-tools#1445.

 - Legacy-Id: 8117
Note: SVN reference [8099] has been migrated to Git commit 4de405e

Author: levkowetz

ietf/doc/tests_material.py

@@ -65,15 +65,15 @@ def test_upload_slides(self):
         test_file.seek(0)
 
         # post
-        r = self.client.post(url, dict(title="Test File",
+        r = self.client.post(url, dict(title="Test File - with fancy title",
                                        name="slides-%s-test-file" % group.acronym,
                                        state=State.objects.get(type="slides", slug="active").pk,
                                        material=test_file))
         self.assertEqual(r.status_code, 302)
 
         doc = Document.objects.get(name="slides-%s-test-file" % group.acronym)
         self.assertEqual(doc.rev, "00")
-        self.assertEqual(doc.title, "Test File")
+        self.assertEqual(doc.title, "Test File - with fancy title")
         self.assertEqual(doc.get_state_slug(), "active")
 
         with open(os.path.join(self.materials_dir, "slides", doc.name + "-" + doc.rev + ".pdf")) as f:

ietf/doc/views_material.py

@@ -7,7 +7,6 @@
 from django.shortcuts import render, get_object_or_404, redirect
 from django.http import HttpResponseForbidden, Http404
 from django.utils.html import mark_safe
-from django.utils.text import slugify
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse as urlreverse
 
@@ -30,9 +29,6 @@ def choose_material_type(request, acronym):
         'material_types': DocTypeName.objects.filter(slug__in=group.features.material_types),
     })
 
-def name_for_material(doc_type, group, title):
-    return "%s-%s-%s" % (doc_type.slug, group.acronym, slugify(title))
-
 class UploadMaterialForm(forms.Form):
     title = forms.CharField(max_length=Document._meta.get_field("title").max_length)
     name = forms.CharField(max_length=Document._meta.get_field("name").max_length)
@@ -112,7 +108,7 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
                 doc.type = document_type
                 doc.group = group
                 doc.rev = "00"
-                doc.name = name_for_material(doc.type, doc.group, form.cleaned_data["title"])
+                doc.name = form.cleaned_data["name"]
                 prev_rev = None
             else:
                 save_document_in_history(doc)