Drop the material doc type, instead present a choice of doc types for uploading materials (currently only slides) and use that, introduce a DOCUMENT_PATH_PATTERN setting for storing the files and only look in proceedings/ for documents that are actually meeting related

 - Legacy-Id: 7802

Author: OleLaursen

ietf/doc/migrations/0019_create_material_states.py

@@ -74,9 +74,10 @@ def file_extension(self):
         return ext.lstrip(".").lower()
 
     def get_file_path(self):
+
         if self.type_id == "draft":
             return settings.INTERNET_DRAFT_PATH
-        elif self.type_id in ("agenda", "minutes", "slides"):
+        elif self.type_id in ("agenda", "minutes", "slides") and self.meeting_related():
             meeting = self.name.split("-")[1]
             return os.path.join(settings.AGENDA_PATH, meeting, self.type_id) + "/"
         elif self.type_id == "charter":
@@ -85,21 +86,27 @@ 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
+            return settings.DOCUMENT_PATH_PATTERN.format(doc=self)
 
     def href(self):
+        meeting_related = self.meeting_related()
+
+        settings_var = settings.DOC_HREFS
+        if meeting_related:
+            settings_var = settings.MEETING_DOC_HREFS
+
         try:
-            format = settings.DOC_HREFS[self.type_id]
+            format = settings_var[self.type_id]
         except KeyError:
             if len(self.external_url):
                 return self.external_url
             return None
+
         meeting = None
-        if self.type_id in ("agenda", "minutes", "slides"):
+        if meeting_related:
             meeting = self.name.split("-")[1]
+
         return format.format(doc=self,meeting=meeting)
 
     def set_state(self, state):
@@ -163,6 +170,11 @@ def active_ballot(self):
         else:
             return None
 
+    def meeting_related(self):
+        return(self.type_id in ("agenda", "minutes", "slides") and (
+            self.name.split("-")[1] == "interim"
+            or self.session_set.exists()))
+
     class Meta:
         abstract = True
 

ietf/doc/models.py

@@ -20,8 +20,8 @@
 from ietf.doc.utils import get_tags_for_stream_id, add_state_change_event
 from ietf.group.models import ( Group, Role, GroupEvent, GroupHistory, GroupStateName,
     GroupStateTransitions, GroupTypeName, GroupURL, ChangeStateGroupEvent )
-from ietf.group.utils import (save_group_in_history, can_manage_group_type, can_manage_materials,
-                              get_group_or_404)
+from ietf.group.utils import save_group_in_history, can_manage_group_type, can_manage_materials
+from ietf.group.utils import get_group_or_404
 from ietf.ietfauth.utils import has_role
 from ietf.person.forms import EmailsField
 from ietf.person.models import Person, Email
@@ -458,17 +458,28 @@ def customize_workflow(request, group_type, acronym):
             'tags': tags,
             })
 
+@login_required
+def choose_material_type(request, acronym, group_type=None):
+    group = get_group_or_404(acronym, group_type)
+    if not group.features.has_materials:
+        raise Http404
+
+    return render(request, 'group/choose_material_type.html', {
+        'group': group,
+        'material_types': DocTypeName.objects.filter(slug__in=group.features.material_types),
+    })
+    
+
 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)
+    state = forms.ModelChoiceField(State.objects.all(), 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)
-
+    def __init__(self, doc_type, action, doc, *args, **kwargs):
         super(UploadMaterialForm, self).__init__(*args, **kwargs)
 
+        self.fields["state"].queryset = self.fields["state"].queryset.filter(type=doc_type)
+
         if action == "new":
             self.fields["state"].widget = forms.HiddenInput()
             self.fields["state"].queryset = self.fields["state"].queryset.filter(slug="active")
@@ -482,27 +493,29 @@ def __init__(self, *args, **kwargs):
 
 
 @login_required
-def edit_material(request, acronym, action="new", name=None, group_type=None):
+def edit_material(request, acronym, action="new", name=None, doc_type=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")
 
+    document_type = get_object_or_404(DocTypeName, slug=doc_type)
+
     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)
+        form = UploadMaterialForm(document_type, action, existing, request.POST, request.FILES)
 
         if form.is_valid():
             if action == "new":
                 d = Document()
-                d.type = DocTypeName.objects.get(slug="material")
+                d.type = document_type
                 d.group = group
-                d.rev = "01"
+                d.rev = "00"
             else:
                 d = existing
 
@@ -514,12 +527,12 @@ def edit_material(request, acronym, action="new", name=None, group_type=None):
             d.time = datetime.datetime.now()
 
             if not d.name:
-                d.name = "material-%s-%s" % (d.group.acronym, slugify(d.title))
+                d.name = "%s-%s-%s" % (d.type_id, 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)
+                    d.name = "%s-%s-%s-%s" % (d.type_id, d.group.acronym, slugify(d.title), i)
                     i += 1
 
             if "material" in form.fields:
@@ -555,7 +568,7 @@ def edit_material(request, acronym, action="new", name=None, group_type=None):
 
             return redirect("group_materials", acronym=group.acronym)
     else:
-        form = UploadMaterialForm(action=action, doc=existing)
+        form = UploadMaterialForm(document_type, action, existing)
 
     return render(request, 'group/edit_material.html', {
         'group': group,

ietf/group/edit.py

@@ -8,6 +8,7 @@ class GroupFeatures(object):
     has_materials = False
     customize_workflow = False
     default_tab = "group_charter"
+    material_types = ["slides"]
 
     def __init__(self, group):
         if group.type_id in ("wg", "rg"):

ietf/group/features.py

@@ -36,6 +36,7 @@
 import itertools
 from tempfile import mkstemp
 import glob
+from collections import OrderedDict
 
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import render_to_string
@@ -259,15 +260,15 @@ def concluded_groups(request):
                   dict(group_types=group_types))
 
 def get_group_materials(group):
-    return Document.objects.filter(group=group, type="material", session=None).exclude(states__slug="inactive")
+    return Document.objects.filter(group=group, type__in=group.features.material_types, 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."""
     kwargs = dict(acronym=group.acronym)
     if group_type:
         kwargs["group_type"] = group_type
 
-    # entries
+    # menu entries
     entries = []
     if group.features.has_documents:
         entries.append(("Documents", urlreverse("ietf.group.info.group_documents", kwargs=kwargs)))
@@ -295,7 +296,7 @@ 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 material", urlreverse("group_new_material", kwargs=kwargs)))
+        actions.append((u"Upload material", urlreverse("group_choose_material_type", kwargs=kwargs)))
 
     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)))
@@ -446,18 +447,23 @@ def materials(request, acronym, group_type=None):
     if not group.features.has_materials:
         raise Http404
 
-    materials = get_group_materials(group).order_by("-time")
-    for d in materials:
+    docs = get_group_materials(group).order_by("type", "-time").select_related("type")
+    doc_types = OrderedDict()
+    for d in docs:
         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
 
+        if d.type not in doc_types:
+            doc_types[d.type] = []
+        doc_types[d.type].append(d)
+
     return render(request, 'group/materials.html',
                   construct_group_menu_context(request, group, "materials", group_type, {
-                      "materials": materials,
+                      "doc_types": doc_types.items(),
                       "can_manage_materials": can_manage_materials(request.user, group)
                   }))
 

ietf/group/info.py

@@ -7,15 +7,11 @@
     (r'^chartering/$', 'ietf.group.info.chartering_groups'),
     (r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.edit.edit', {'action': "charter"}, "group_create"),
     (r'^concluded/$', 'ietf.group.info.concluded_groups'),
-    # FIXME: the remainder here is currently duplicated in urls_info.py, need to unify these at some point
+    # FIXME: the things below are duplicated in urls_info.py, need to unify these at some point
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/$', 'ietf.group.info.group_home', None, "group_home"),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/documents/$', 'ietf.group.info.group_documents', None, "group_docs"),
     (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/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'),
@@ -26,6 +22,12 @@
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/milestones/charter/reset/$', 'ietf.group.milestones.reset_charter_milestones', None, "group_reset_charter_milestones"),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/ajax/searchdocs/$', 'ietf.group.milestones.ajax_search_docs', None, "group_ajax_search_docs"),
     (r'^(?P<acronym>[a-zA-Z0-9-._]+)/workflow/$', 'ietf.group.edit.customize_workflow'),
+
+    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/$', 'ietf.group.info.materials', None, "group_materials"),
+    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/new/$', 'ietf.group.edit.choose_material_type', None, "group_choose_material_type"),
+    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/new/(?P<doc_type>[\w-]+)/$', 'ietf.group.edit.edit_material', { 'action': "new" }, "group_new_material"),
+    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/(?P<name>[^/]+)/edit/$', 'ietf.group.edit.edit_material', { 'action': "edit" }, "group_edit_material"),
+    (r'^(?P<acronym>[a-zA-Z0-9-._]+)/materials/(?P<name>[^/]+)/revise/$', 'ietf.group.edit.edit_material', { 'action': "revise" }, "group_revise_material"),
 )
 
 

ietf/group/urls.py

@@ -118,4 +118,3 @@ def get_group_or_404(acronym, group_type):
         possible_groups = possible_groups.filter(type=group_type)
 
     return get_object_or_404(possible_groups, acronym=acronym)
-