Added support data for a tentative new material document type, add a upload/edit/revise page for uploading and revising group materials, still missing a couple of details and tests

 - Legacy-Id: 7776

Author: OleLaursen

ietf/doc/migrations/0019_create_material_states.py

@@ -85,6 +85,8 @@ def get_file_path(self):
             return settings.CONFLICT_REVIEW_PATH
         elif self.type_id == "statchg":
             return settings.STATUS_CHANGE_PATH
+        elif self.type_id == "material":
+            return settings.MATERIALS_PATH
         else:
             raise NotImplemented
 

ietf/doc/models.py

@@ -9,12 +9,13 @@
 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.http import Http404, HttpResponse
 from django.contrib.auth.decorators import login_required
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc.models import DocAlias, DocTagName, Document, State, save_document_in_history
+from ietf.doc.models import Document, DocAlias, DocTagName, DocTypeName, DocEvent, State, save_document_in_history
 from ietf.doc.utils import get_tags_for_stream_id
 from ietf.group.models import ( Group, Role, GroupEvent, GroupHistory, GroupStateName,
     GroupStateTransitions, GroupTypeName, GroupURL, ChangeStateGroupEvent )
@@ -456,18 +457,95 @@ def customize_workflow(request, group_type, acronym):
             'tags': tags,
             })
 
+class UploadMaterialForm(forms.Form):
+    title = forms.CharField(max_length=Document._meta.get_field("title").max_length)
+    state = forms.ModelChoiceField(State.objects.filter(type="material"), empty_label=None)
+    material = forms.FileField(label='File', help_text="PDF or text file (ASCII/UTF-8)")
+
+    def __init__(self, *args, **kwargs):
+        action = kwargs.pop("action")
+        doc = kwargs.pop("doc", None)
+
+        super(UploadMaterialForm, self).__init__(*args, **kwargs)
+
+        if action == "new":
+            self.fields["state"].widget = forms.HiddenInput()
+            self.fields["state"].queryset = self.fields["state"].queryset.filter(slug="active")
+        else:
+            self.fields["title"].initial = doc.title
+            self.fields["state"].initial = doc.get_state().pk if doc.get_state() else None
+
+            if action == "edit":
+                del self.fields["material"]
+
+
 @login_required
-def upload_materials(request, acronym, group_type=None):
+def edit_material(request, acronym, action="new", name=None, group_type=None):
     group = get_group_or_404(acronym, group_type)
     if not group.features.has_materials:
         raise Http404
 
     if not can_manage_materials(request.user, group):
         return HttpResponseForbidden("You don't have permission to access this view")
 
-    # FIXME: fill in
+    existing = None
+    if name and action != "new":
+        existing = get_object_or_404(Document, type="material", name=name)
+
+    if request.method == 'POST':
+        form = UploadMaterialForm(request.POST, request.FILES, action=action, doc=existing)
+
+        if form.is_valid():
+            if action == "new":
+                d = Document()
+                d.type = DocTypeName.objects.get(slug="material")
+                d.group = group
+                d.rev = "01"
+            else:
+                d = existing
+
+            d.title = form.cleaned_data["title"]
+            d.time = datetime.datetime.now()
+
+            if not d.name:
+                d.name = "material-%s-%s" % (d.group.acronym, slugify(d.title))
+                i = 2
+                while True:
+                    if not Document.objects.filter(name=d.name).exists():
+                        break
+                    d.name = "material-%s-%s-%s" % (d.group.acronym, slugify(d.title), i)
+                    i += 1
+
+            if "material" in form.fields:
+                if action != "new":
+                    d.rev = "%02d" % (int(d.rev) + 1)
+
+                f = form.cleaned_data["material"]
+                file_ext = os.path.splitext(f.name)[1]
+
+                with open(os.path.join(d.get_file_path(), d.name + "-" + d.rev + file_ext), 'wb+') as dest:
+                    for chunk in f.chunks():
+                        dest.write(chunk)
+
+            d.save()
+
+            # FIXME: missing edit title event
+
+            # FIXME: missing changed state event
+            d.set_state(form.cleaned_data["state"])
+
+            # FIXME: wrong, should be new revision event
+            DocEvent.objects.create(doc=d,
+                                    by=request.user.person,
+                                    type='uploaded',
+                                    desc="Uploaded material")
+
+            return redirect("group_materials", acronym=group.acronym)
+    else:
+        form = UploadMaterialForm(action=action, doc=existing)
 
-    return render(request, 'group/materials.html',
-                  construct_group_menu_context(request, group, "materials", group_type, {
-                      "materials": materials,
-                  }))
+    return render(request, 'group/edit_material.html', {
+        'group': group,
+        'form': form,
+        'action': action,
+    })

ietf/group/edit.py

@@ -35,6 +35,7 @@
 import os
 import itertools
 from tempfile import mkstemp
+import glob
 
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import render_to_string
@@ -258,7 +259,7 @@ def concluded_groups(request):
                   dict(group_types=group_types))
 
 def get_group_materials(group):
-    return Document.objects.filter(group=group).exclude(states__slug="deleted")#.exclude(session=None).exclude(type="charter")
+    return Document.objects.filter(group=group, type="material", session=None).exclude(states__slug="inactive")
 
 def construct_group_menu_context(request, group, selected, group_type, others):
     """Return context with info for the group menu filled in."""
@@ -294,9 +295,9 @@ def construct_group_menu_context(request, group, selected, group_type, others):
             actions.append((u"Add or edit milestones", urlreverse("group_edit_milestones", kwargs=kwargs)))
 
     if group.features.has_materials and can_manage_materials(request.user, group):
-        actions.append((u"Upload materials", urlreverse("group_upload_materials", kwargs=kwargs)))
+        actions.append((u"Upload material", urlreverse("group_new_material", kwargs=kwargs)))
 
-    if group.state_id != "conclude" and can_manage:
+    if group.type_id in ("rg", "wg") and group.state_id != "conclude" and can_manage:
         actions.append((u"Edit group", urlreverse("group_edit", kwargs=kwargs)))
 
     if group.features.customize_workflow and (is_chair or can_manage):
@@ -446,10 +447,18 @@ def materials(request, acronym, group_type=None):
         raise Http404
 
     materials = get_group_materials(group).order_by("-time")
+    for d in materials:
+        extension = ""
+        globs = glob.glob(d.get_file_path() + d.name + "-" + d.rev + ".*")
+        if globs:
+            extension = os.path.splitext(globs[0])[1]
+
+        d.full_url = d.href() + extension
 
     return render(request, 'group/materials.html',
                   construct_group_menu_context(request, group, "materials", group_type, {
                       "materials": materials,
+                      "can_manage_materials": can_manage_materials(request.user, group)
                   }))
 
 def nodename(name):

ietf/group/info.py

@@ -13,7 +13,9 @@
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/charter/$', 'ietf.group.info.group_charter', None, 'group_charter'),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/history/$', 'ietf.group.info.history'),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/$', 'ietf.group.info.materials', None, "group_materials"),
-    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/upload/$', 'ietf.group.edit.upload_materials', None, "group_upload_materials"),
+    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/new/$', 'ietf.group.edit.edit_material', { 'action': "new" }, "group_new_material"),
+    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/(?P<name>material-[^/]+)/edit/$', 'ietf.group.edit.edit_material', { 'action': "edit" }, "group_edit_material"),
+    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/(?P<name>material-[^/]+)/revise/$', 'ietf.group.edit.edit_material', { 'action': "revise" }, "group_revise_material"),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/deps/dot/$', 'ietf.group.info.dependencies_dot'),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/deps/pdf/$', 'ietf.group.info.dependencies_pdf'),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/init-charter/', 'ietf.group.edit.submit_initial_charter'),