Merged in branch/iola/team-support from olau@iola.dk. This generalises and extends the group support for WGs and RGs so that also other groups, such as for instance the Edu Team, can have pages.

 - Legacy-Id: 8013

Author: levkowetz

ietf/community/display.py

@@ -88,7 +88,7 @@ def get_value(self, document, raw=False):
         if raw or not document.group.type_id in ['wg','rg']:
             return document.group.acronym
         else:
-            return '<a href="%s">%s</a>' % (urlreverse('group_docs', kwargs=dict(group_type=document.group.type_id, acronym=document.group.acronym)), document.group.acronym) if (document.group and document.group.acronym != 'none')  else ''
+            return '<a href="%s">%s</a>' % (urlreverse('group_home', kwargs=dict(group_type=document.group.type_id, acronym=document.group.acronym)), document.group.acronym) if (document.group and document.group.acronym != 'none')  else ''
 
 
 class ADField(DisplayField):

ietf/doc/models.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":
@@ -86,18 +87,26 @@ def get_file_path(self):
         elif self.type_id == "statchg":
             return settings.STATUS_CHANGE_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):
@@ -120,6 +129,9 @@ def get_state(self, state_type=None):
         """Get state of type, or default state for document type if
         not specified. Uses a local cache to speed multiple state
         reads up."""
+        if self.pk == None: # states is many-to-many so not in database implies no state
+            return None
+
         if state_type == None:
             state_type = self.type_id
 
@@ -158,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() if isinstance(self, Document) else self.doc.session_set.exists())))
+
     class Meta:
         abstract = True
 
@@ -270,12 +287,9 @@ def canonical_name(self):
             a = self.docalias_set.filter(name__startswith="rfc")
             if a:
                 name = a[0].name
-#         elif self.type_id == "charter":
-#             if self.group.type.slug == "rg":
-#                 top_org = "irtf"
-#             else:
-#                 top_org = "ietf"
-#             return "charter-%s-%s" % (top_org, self.chartered_group.acronym)
+        elif self.type_id == "charter":
+            from ietf.doc.utils_charter import charter_name_for_group
+            return charter_name_for_group(self.chartered_group)
         return name
 
     def canonical_docalias(self):
@@ -468,7 +482,11 @@ class Meta:
 
 class DocHistory(DocumentInfo):
     doc = models.ForeignKey(Document, related_name="history_set")
-    name = models.CharField(max_length=255) # WG charter canonical names can change if the group acronym changes
+    # the name here is used to capture the canonical name at the time
+    # - it would perhaps be more elegant to simply call the attribute
+    # canonical_name and replace the function on Document with a
+    # property
+    name = models.CharField(max_length=255)
     related = models.ManyToManyField('DocAlias', through=RelatedDocHistory, blank=True)
     authors = models.ManyToManyField(Email, through=DocHistoryAuthor, blank=True)
     def __unicode__(self):

ietf/doc/templatetags/ietf_filters.py

@@ -22,10 +22,6 @@ def expand_comma(value):
     long comma-separated lists."""
     return value.replace(",", ", ")
 
-@register.filter(name='format_charter')
-def format_charter(value):
-    return value.replace("\n\n", "</p><p>").replace("\n","<br/>\n")
-
 @register.filter
 def indent(value, numspaces=2):
     replacement = "\n" + " " * int(numspaces)

ietf/doc/tests.py

@@ -217,6 +217,22 @@ def test_document_conflict_review(self):
         r = self.client.get(urlreverse("doc_view", kwargs=dict(name='conflict-review-imaginary-irtf-submission')))
         self.assertEqual(r.status_code, 200)
 
+    def test_document_material(self):
+        draft = make_test_data()
+
+        doc = Document.objects.create(
+            name="slides-testteam-test-slides",
+            rev="00",
+            title="Test Slides",
+            group=draft.group,
+            type_id="slides"
+        )
+        doc.set_state(State.objects.get(type="slides", slug="active"))
+        DocAlias.objects.create(name=doc.name, document=doc)
+
+        r = self.client.get(urlreverse("doc_view", kwargs=dict(name=doc.name)))
+        self.assertEqual(r.status_code, 200)
+
     def test_document_ballot(self):
         doc = make_test_data()
         ballot = doc.active_ballot()

ietf/doc/tests_material.py

@@ -0,0 +1,138 @@
+# Copyright The IETF Trust 2011, All Rights Reserved
+
+import os, shutil
+from StringIO import StringIO
+from pyquery import PyQuery
+
+from django.conf import settings
+from django.core.urlresolvers import reverse as urlreverse
+
+from ietf.doc.models import Document, State, DocAlias
+from ietf.group.models import Group
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
+
+class GroupMaterialTests(TestCase):
+    def setUp(self):
+        self.materials_dir = os.path.abspath("tmp-document-dir")
+        os.mkdir(self.materials_dir)
+        os.mkdir(os.path.join(self.materials_dir, "slides"))
+        settings.DOCUMENT_PATH_PATTERN = self.materials_dir + "/{doc.type_id}/"
+
+    def tearDown(self):
+        shutil.rmtree(self.materials_dir)
+
+    def create_slides(self):
+        group = Group.objects.create(type_id="team", acronym="testteam", name="Test Team", state_id="active")
+
+        doc = Document.objects.create(name="slides-testteam-test-file", rev="00", type_id="slides", group=group)
+        doc.set_state(State.objects.get(type="slides", slug="active"))
+        DocAlias.objects.create(name=doc.name, document=doc)
+
+        return doc
+
+    def test_choose_material_type(self):
+        group = Group.objects.create(type_id="team", acronym="testteam", name="Test Team", state_id="active")
+
+        url = urlreverse('ietf.doc.views_material.choose_material_type', kwargs=dict(acronym=group.acronym))
+        login_testing_unauthorized(self, "secretary", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue("Slides" in r.content)
+
+    def test_upload_slides(self):
+        group = Group.objects.create(type_id="team", acronym="testteam", name="Test Team", state_id="active")
+
+        url = urlreverse('group_new_material', kwargs=dict(acronym=group.acronym, doc_type="slides"))
+        login_testing_unauthorized(self, "secretary", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        content = "%PDF-1.5\n..."
+        test_file = StringIO(content)
+        test_file.name = "unnamed.pdf"
+
+        # faulty post
+        r = self.client.post(url, dict(title="", name="", state="", material=test_file))
+
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(len(q('form ul.errorlist')) > 0)
+
+        test_file.seek(0)
+
+        # post
+        r = self.client.post(url, dict(title="Test File",
+                                       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.get_state_slug(), "active")
+
+        with open(os.path.join(self.materials_dir, "slides", doc.name + "-" + doc.rev + ".pdf")) as f:
+            self.assertEqual(f.read(), content)
+
+        # check that posting same name is prevented
+        test_file.seek(0)
+
+        r = self.client.post(url, dict(title="Test File",
+                                       name=doc.name,
+                                       state=State.objects.get(type="slides", slug="active").pk,
+                                       material=test_file))
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        
+    def test_change_state(self):
+        doc = self.create_slides()
+
+        url = urlreverse('material_edit', kwargs=dict(name=doc.name, action="state"))
+        login_testing_unauthorized(self, "secretary", url)
+
+        # post
+        r = self.client.post(url, dict(state=State.objects.get(type="slides", slug="deleted").pk))
+        self.assertEqual(r.status_code, 302)
+        doc = Document.objects.get(name=doc.name)
+        self.assertEqual(doc.get_state_slug(), "deleted")
+
+    def test_edit_title(self):
+        doc = self.create_slides()
+
+        url = urlreverse('material_edit', kwargs=dict(name=doc.name, action="title"))
+        login_testing_unauthorized(self, "secretary", url)
+
+        # post
+        r = self.client.post(url, dict(title="New title"))
+        self.assertEqual(r.status_code, 302)
+        doc = Document.objects.get(name=doc.name)
+        self.assertEqual(doc.title, "New title")
+
+    def test_revise(self):
+        doc = self.create_slides()
+
+        url = urlreverse('material_edit', kwargs=dict(name=doc.name, action="revise"))
+        login_testing_unauthorized(self, "secretary", url)
+
+        content = "some text"
+        test_file = StringIO(content)
+        test_file.name = "unnamed.txt"
+
+        # post
+        r = self.client.post(url, dict(title="New title",
+                                       state=State.objects.get(type="slides", slug="active").pk,
+                                       material=test_file))
+        self.assertEqual(r.status_code, 302)
+        doc = Document.objects.get(name=doc.name)
+        self.assertEqual(doc.rev, "01")
+        self.assertEqual(doc.title, "New title")
+        self.assertEqual(doc.get_state_slug(), "active")
+
+        with open(os.path.join(self.materials_dir, "slides", doc.name + "-" + doc.rev + ".txt")) as f:
+            self.assertEqual(f.read(), content)
+

ietf/doc/urls.py

@@ -102,4 +102,5 @@
     (r'^(?P<name>charter-[A-Za-z0-9._+-]+)/', include('ietf.doc.urls_charter')),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/conflict-review/', include('ietf.doc.urls_conflict_review')),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/status-change/', include('ietf.doc.urls_status_change')),
+    (r'^(?P<name>[A-Za-z0-9._+-]+)/material/', include('ietf.doc.urls_material')),
 )

ietf/doc/urls_material.py

@@ -0,0 +1,6 @@
+from django.conf.urls import patterns, url
+
+urlpatterns = patterns('ietf.doc.views_material',
+    url(r'^(?P<action>state|title|revise)/$', "edit_material", name="material_edit"),
+)
+

ietf/doc/utils.py

@@ -5,6 +5,7 @@
 
 from django.conf import settings
 from django.db.models.query import EmptyQuerySet
+from django.forms import ValidationError
 
 from ietf.utils import markup_txt
 from ietf.doc.models import Document, DocHistory
@@ -228,16 +229,13 @@ def add_links_in_new_revision_events(doc, events, diff_revisions):
 
 
 def get_document_content(key, filename, split=True, markup=True):
-    f = None
     try:
-        f = open(filename, 'rb')
-        raw_content = f.read()
+        with open(filename, 'rb') as f:
+            raw_content = f.read()
     except IOError:
         error = "Error; cannot read ("+key+")"
         return error
-    finally:
-        if f:
-            f.close()
+
     if markup:
         return markup_txt.markup(raw_content, split)
     else:
@@ -397,3 +395,18 @@ def rebuild_reference_relations(doc):
         ret['unfound']=list(unfound) 
 
     return ret
+
+def check_common_doc_name_rules(name):
+    """Check common rules for document names for use in forms, throws
+    ValidationError in case there's a problem."""
+
+    errors = []
+    if re.search("[^a-z0-9-]", name):
+        errors.append("The name may only contain digits, lowercase letters and dashes.")
+    if re.search("--", name):
+        errors.append("Please do not put more than one hyphen between any two words in the name.")
+    if re.search("-[0-9]{2}$", name):
+        errors.append("This name looks like ends in a version number. -00 will be added automatically. Please adjust the end of the name.")
+
+    if errors:
+        raise ValidationError(errors)

ietf/doc/utils_charter.py

@@ -9,6 +9,13 @@
 from ietf.utils.history import find_history_active_at
 from ietf.utils.mail import send_mail_text
 
+def charter_name_for_group(group):
+    if group.type_id == "rg":
+        top_org = "irtf"
+    else:
+        top_org = "ietf"
+
+    return "charter-%s-%s" % (top_org, group.acronym)
 
 def next_revision(rev):
     if rev == "":