From 544cd702bba57b64473a3351eaa014ff1385151d Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Fri, 30 May 2014 14:07:16 +0000 Subject: [PATCH] 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 --- .../migrations/0019_create_material_states.py | 373 ------------------ ietf/doc/models.py | 24 +- ietf/group/edit.py | 41 +- ietf/group/features.py | 1 + ietf/group/info.py | 18 +- ietf/group/urls.py | 12 +- ietf/group/utils.py | 1 - .../0021_create_material_doc_type.py | 190 --------- ietf/settings.py | 9 +- .../templates/group/choose_material_type.html | 23 ++ ietf/templates/group/edit_material.html | 2 - ietf/templates/group/materials.html | 56 +-- 12 files changed, 124 insertions(+), 626 deletions(-) delete mode 100644 ietf/doc/migrations/0019_create_material_states.py delete mode 100644 ietf/name/migrations/0021_create_material_doc_type.py create mode 100644 ietf/templates/group/choose_material_type.html diff --git a/ietf/doc/migrations/0019_create_material_states.py b/ietf/doc/migrations/0019_create_material_states.py deleted file mode 100644 index 29bc729bf..000000000 --- a/ietf/doc/migrations/0019_create_material_states.py +++ /dev/null @@ -1,373 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - depends_on = ( - ("name", "0021_create_material_doc_type"), - ) - - def forwards(self, orm): - state_type, _ = orm.StateType.objects.get_or_create(slug="material", label="State") - orm.State.objects.get_or_create(slug="active", name="Active", order=1, type=state_type) - orm.State.objects.get_or_create(slug="inactive", name="Inactive", order=2, type=state_type) - - def backwards(self, orm): - orm.State.objects.filter(slug="inactive", type="material").delete() - orm.State.objects.filter(slug="active", type="material").delete() - orm.StateType.objects.filter(slug="material").delete() - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) - }, - u'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - u'doc.ballotdocevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'BallotDocEvent', '_ormbases': [u'doc.DocEvent']}, - 'ballot_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.BallotType']"}), - u'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}) - }, - u'doc.ballotpositiondocevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'BallotPositionDocEvent', '_ormbases': [u'doc.DocEvent']}, - 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']"}), - 'ballot': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['doc.BallotDocEvent']", 'null': 'True'}), - 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'comment_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'discuss': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'discuss_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - u'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}), - 'pos': ('django.db.models.fields.related.ForeignKey', [], {'default': "'norecord'", 'to': u"orm['name.BallotPositionName']"}) - }, - u'doc.ballottype': { - 'Meta': {'ordering': "['order']", 'object_name': 'BallotType'}, - 'doc_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'positions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['name.BallotPositionName']", 'symmetrical': 'False', 'blank': 'True'}), - 'question': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'doc.consensusdocevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'ConsensusDocEvent', '_ormbases': [u'doc.DocEvent']}, - 'consensus': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - u'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}) - }, - u'doc.deletedevent': { - 'Meta': {'object_name': 'DeletedEvent'}, - 'by': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']"}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'json': ('django.db.models.fields.TextField', [], {}), - 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}) - }, - u'doc.docalias': { - 'Meta': {'object_name': 'DocAlias'}, - 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.Document']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}) - }, - u'doc.docevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'DocEvent'}, - 'by': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']"}), - 'desc': ('django.db.models.fields.TextField', [], {}), - 'doc': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.Document']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'db_index': 'True'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'doc.dochistory': { - 'Meta': {'object_name': 'DocHistory'}, - 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_dochistory_set'", 'null': 'True', 'to': u"orm['person.Person']"}), - 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['person.Email']", 'symmetrical': 'False', 'through': u"orm['doc.DocHistoryAuthor']", 'blank': 'True'}), - 'doc': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'history_set'", 'to': u"orm['doc.Document']"}), - 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['group.Group']", 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), - 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), - 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'related': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.DocAlias']", 'symmetrical': 'False', 'through': u"orm['doc.RelatedDocHistory']", 'blank': 'True'}), - 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), - 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_dochistory_set'", 'null': 'True', 'to': u"orm['person.Person']"}), - 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), - 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), - 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), - 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) - }, - u'doc.dochistoryauthor': { - 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocHistoryAuthor'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Email']"}), - 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.DocHistory']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {}) - }, - u'doc.docreminder': { - 'Meta': {'object_name': 'DocReminder'}, - 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'due': ('django.db.models.fields.DateTimeField', [], {}), - 'event': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.DocEvent']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.DocReminderTypeName']"}) - }, - u'doc.document': { - 'Meta': {'object_name': 'Document'}, - 'abstract': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'ad': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ad_document_set'", 'null': 'True', 'to': u"orm['person.Person']"}), - 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['person.Email']", 'symmetrical': 'False', 'through': u"orm['doc.DocumentAuthor']", 'blank': 'True'}), - 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'external_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['group.Group']", 'null': 'True', 'blank': 'True'}), - 'intended_std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.IntendedStdLevelName']", 'null': 'True', 'blank': 'True'}), - 'internal_comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'primary_key': 'True'}), - 'note': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'notify': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}), - 'pages': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16', 'blank': 'True'}), - 'shepherd': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'shepherd_document_set'", 'null': 'True', 'to': u"orm['person.Person']"}), - 'states': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), - 'std_level': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.StdLevelName']", 'null': 'True', 'blank': 'True'}), - 'stream': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.StreamName']", 'null': 'True', 'blank': 'True'}), - 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['name.DocTagName']", 'null': 'True', 'blank': 'True'}), - 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.DocTypeName']", 'null': 'True', 'blank': 'True'}) - }, - u'doc.documentauthor': { - 'Meta': {'ordering': "['document', 'order']", 'object_name': 'DocumentAuthor'}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Email']"}), - 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.Document']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - }, - u'doc.initialreviewdocevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'InitialReviewDocEvent', '_ormbases': [u'doc.DocEvent']}, - u'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}), - 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) - }, - u'doc.lastcalldocevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'LastCallDocEvent', '_ormbases': [u'doc.DocEvent']}, - u'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}), - 'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}) - }, - u'doc.newrevisiondocevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'NewRevisionDocEvent', '_ormbases': [u'doc.DocEvent']}, - u'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}), - 'rev': ('django.db.models.fields.CharField', [], {'max_length': '16'}) - }, - u'doc.relateddochistory': { - 'Meta': {'object_name': 'RelatedDocHistory'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'relationship': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.DocRelationshipName']"}), - 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.DocHistory']"}), - 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reversely_related_document_history_set'", 'to': u"orm['doc.DocAlias']"}) - }, - u'doc.relateddocument': { - 'Meta': {'object_name': 'RelatedDocument'}, - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'relationship': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.DocRelationshipName']"}), - 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.Document']"}), - 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.DocAlias']"}) - }, - u'doc.state': { - 'Meta': {'ordering': "['type', 'order']", 'object_name': 'State'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': u"orm['doc.State']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), - 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.StateType']"}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'doc.statedocevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'StateDocEvent', '_ormbases': [u'doc.DocEvent']}, - u'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}), - 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.State']", 'null': 'True', 'blank': 'True'}), - 'state_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['doc.StateType']"}) - }, - u'doc.statetype': { - 'Meta': {'object_name': 'StateType'}, - 'label': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '30', 'primary_key': 'True'}) - }, - u'doc.telechatdocevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'TelechatDocEvent', '_ormbases': [u'doc.DocEvent']}, - u'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}), - 'returning_item': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'telechat_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}) - }, - u'doc.writeupdocevent': { - 'Meta': {'ordering': "['-time', '-id']", 'object_name': 'WriteupDocEvent', '_ormbases': [u'doc.DocEvent']}, - u'docevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['doc.DocEvent']", 'unique': 'True', 'primary_key': 'True'}), - 'text': ('django.db.models.fields.TextField', [], {'blank': 'True'}) - }, - u'group.group': { - 'Meta': {'object_name': 'Group'}, - 'acronym': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '40'}), - 'ad': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']", 'null': 'True', 'blank': 'True'}), - 'charter': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'chartered_group'", 'unique': 'True', 'null': 'True', 'to': u"orm['doc.Document']"}), - 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'list_archive': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'list_email': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), - 'list_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}), - 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['group.Group']", 'null': 'True', 'blank': 'True'}), - 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.GroupStateName']", 'null': 'True'}), - 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['name.GroupTypeName']", 'null': 'True'}), - 'unused_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['doc.State']", 'symmetrical': 'False', 'blank': 'True'}), - 'unused_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['name.DocTagName']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'name.ballotpositionname': { - 'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'}, - 'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.docrelationshipname': { - 'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'revname': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.docremindertypename': { - 'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.doctagname': { - 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.doctypename': { - 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.groupstatename': { - 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.grouptypename': { - 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.intendedstdlevelname': { - 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.stdlevelname': { - 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.streamname': { - 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'person.email': { - 'Meta': {'object_name': 'Email'}, - 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'address': ('django.db.models.fields.CharField', [], {'max_length': '64', 'primary_key': 'True'}), - 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['person.Person']", 'null': 'True'}), - 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) - }, - u'person.person': { - 'Meta': {'object_name': 'Person'}, - 'address': ('django.db.models.fields.TextField', [], {'max_length': '255', 'blank': 'True'}), - 'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'ascii': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'ascii_short': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'time': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'}) - } - } - - complete_apps = ['doc'] - symmetrical = True diff --git a/ietf/doc/models.py b/ietf/doc/models.py index 443ea3bf0..e70af5db4 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -74,9 +74,10 @@ class DocumentInfo(models.Model): 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 @@ class DocumentInfo(models.Model): 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 @@ class DocumentInfo(models.Model): 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 diff --git a/ietf/group/edit.py b/ietf/group/edit.py index 33b9f3a3e..620aab91c 100644 --- a/ietf/group/edit.py +++ b/ietf/group/edit.py @@ -20,8 +20,8 @@ from ietf.doc.models import NewRevisionDocEvent, save_document_in_history 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,7 +493,7 @@ class UploadMaterialForm(forms.Form): @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 @@ -490,19 +501,21 @@ def edit_material(request, acronym, action="new", name=None, group_type=None): 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, diff --git a/ietf/group/features.py b/ietf/group/features.py index e97d06529..3ab67a5f9 100644 --- a/ietf/group/features.py +++ b/ietf/group/features.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"): diff --git a/ietf/group/info.py b/ietf/group/info.py index 44fe2b3cd..4c237cb3f 100644 --- a/ietf/group/info.py +++ b/ietf/group/info.py @@ -36,6 +36,7 @@ import os 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,7 +260,7 @@ 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.""" @@ -267,7 +268,7 @@ def construct_group_menu_context(request, group, selected, group_type, others): 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,8 +447,9 @@ 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: @@ -455,9 +457,13 @@ def materials(request, acronym, group_type=None): 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) })) diff --git a/ietf/group/urls.py b/ietf/group/urls.py index 800dc4d3c..7ea9150a8 100644 --- a/ietf/group/urls.py +++ b/ietf/group/urls.py @@ -7,15 +7,11 @@ urlpatterns = patterns('', (r'^chartering/$', 'ietf.group.info.chartering_groups'), (r'^chartering/create/(?P(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[a-zA-Z0-9-._]+)/$', 'ietf.group.info.group_home', None, "group_home"), (r'^(?P[a-zA-Z0-9-._]+)/documents/$', 'ietf.group.info.group_documents', None, "group_docs"), (r'^(?P[a-zA-Z0-9-._]+)/charter/$', 'ietf.group.info.group_charter', None, 'group_charter'), (r'^(?P[a-zA-Z0-9-._]+)/history/$', 'ietf.group.info.history'), - (r'^(?P[a-zA-Z0-9-._]+)/materials/$', 'ietf.group.info.materials', None, "group_materials"), - (r'^(?P[a-zA-Z0-9-._]+)/materials/new/$', 'ietf.group.edit.edit_material', { 'action': "new" }, "group_new_material"), - (r'^(?P[a-zA-Z0-9-._]+)/materials/(?Pmaterial-[^/]+)/edit/$', 'ietf.group.edit.edit_material', { 'action': "edit" }, "group_edit_material"), - (r'^(?P[a-zA-Z0-9-._]+)/materials/(?Pmaterial-[^/]+)/revise/$', 'ietf.group.edit.edit_material', { 'action': "revise" }, "group_revise_material"), (r'^(?P[a-zA-Z0-9-._]+)/deps/dot/$', 'ietf.group.info.dependencies_dot'), (r'^(?P[a-zA-Z0-9-._]+)/deps/pdf/$', 'ietf.group.info.dependencies_pdf'), (r'^(?P[a-zA-Z0-9-._]+)/init-charter/', 'ietf.group.edit.submit_initial_charter'), @@ -26,6 +22,12 @@ urlpatterns = patterns('', (r'^(?P[a-zA-Z0-9-._]+)/milestones/charter/reset/$', 'ietf.group.milestones.reset_charter_milestones', None, "group_reset_charter_milestones"), (r'^(?P[a-zA-Z0-9-._]+)/ajax/searchdocs/$', 'ietf.group.milestones.ajax_search_docs', None, "group_ajax_search_docs"), (r'^(?P[a-zA-Z0-9-._]+)/workflow/$', 'ietf.group.edit.customize_workflow'), + + (r'^(?P[a-zA-Z0-9-._]+)/materials/$', 'ietf.group.info.materials', None, "group_materials"), + (r'^(?P[a-zA-Z0-9-._]+)/materials/new/$', 'ietf.group.edit.choose_material_type', None, "group_choose_material_type"), + (r'^(?P[a-zA-Z0-9-._]+)/materials/new/(?P[\w-]+)/$', 'ietf.group.edit.edit_material', { 'action': "new" }, "group_new_material"), + (r'^(?P[a-zA-Z0-9-._]+)/materials/(?P[^/]+)/edit/$', 'ietf.group.edit.edit_material', { 'action': "edit" }, "group_edit_material"), + (r'^(?P[a-zA-Z0-9-._]+)/materials/(?P[^/]+)/revise/$', 'ietf.group.edit.edit_material', { 'action': "revise" }, "group_revise_material"), ) diff --git a/ietf/group/utils.py b/ietf/group/utils.py index 849802411..c6a96a03d 100644 --- a/ietf/group/utils.py +++ b/ietf/group/utils.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) - diff --git a/ietf/name/migrations/0021_create_material_doc_type.py b/ietf/name/migrations/0021_create_material_doc_type.py deleted file mode 100644 index 06db0ea5b..000000000 --- a/ietf/name/migrations/0021_create_material_doc_type.py +++ /dev/null @@ -1,190 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - def forwards(self, orm): - orm.DocTypeName.objects.get_or_create(slug="material", name="Material") - - def backwards(self, orm): - orm.DocTypeName.objects.filter(slug="material").delete() - - models = { - u'name.ballotpositionname': { - 'Meta': {'ordering': "['order']", 'object_name': 'BallotPositionName'}, - 'blocking': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.constraintname': { - 'Meta': {'ordering': "['order']", 'object_name': 'ConstraintName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'penalty': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.dbtemplatetypename': { - 'Meta': {'ordering': "['order']", 'object_name': 'DBTemplateTypeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.docrelationshipname': { - 'Meta': {'ordering': "['order']", 'object_name': 'DocRelationshipName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'revname': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.docremindertypename': { - 'Meta': {'ordering': "['order']", 'object_name': 'DocReminderTypeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.doctagname': { - 'Meta': {'ordering': "['order']", 'object_name': 'DocTagName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.doctypename': { - 'Meta': {'ordering': "['order']", 'object_name': 'DocTypeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.draftsubmissionstatename': { - 'Meta': {'ordering': "['order']", 'object_name': 'DraftSubmissionStateName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'next_states': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'previous_states'", 'blank': 'True', 'to': u"orm['name.DraftSubmissionStateName']"}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.feedbacktype': { - 'Meta': {'ordering': "['order']", 'object_name': 'FeedbackType'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.groupmilestonestatename': { - 'Meta': {'ordering': "['order']", 'object_name': 'GroupMilestoneStateName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.groupstatename': { - 'Meta': {'ordering': "['order']", 'object_name': 'GroupStateName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.grouptypename': { - 'Meta': {'ordering': "['order']", 'object_name': 'GroupTypeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.intendedstdlevelname': { - 'Meta': {'ordering': "['order']", 'object_name': 'IntendedStdLevelName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.liaisonstatementpurposename': { - 'Meta': {'ordering': "['order']", 'object_name': 'LiaisonStatementPurposeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.meetingtypename': { - 'Meta': {'ordering': "['order']", 'object_name': 'MeetingTypeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.nomineepositionstate': { - 'Meta': {'ordering': "['order']", 'object_name': 'NomineePositionState'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.rolename': { - 'Meta': {'ordering': "['order']", 'object_name': 'RoleName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.sessionstatusname': { - 'Meta': {'ordering': "['order']", 'object_name': 'SessionStatusName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.stdlevelname': { - 'Meta': {'ordering': "['order']", 'object_name': 'StdLevelName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.streamname': { - 'Meta': {'ordering': "['order']", 'object_name': 'StreamName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - }, - u'name.timeslottypename': { - 'Meta': {'ordering': "['order']", 'object_name': 'TimeSlotTypeName'}, - 'desc': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'slug': ('django.db.models.fields.CharField', [], {'max_length': '8', 'primary_key': 'True'}), - 'used': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) - } - } - - complete_apps = ['name'] - symmetrical = True diff --git a/ietf/settings.py b/ietf/settings.py index 00c8d6a7b..3321622ee 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -251,6 +251,7 @@ DATETIME_FORMAT = "Y-m-d H:i" # Override this in settings_local.py if needed # *_PATH variables ends with a slash/ . +DOCUMENT_PATH_PATTERN = '/a/www/ietf-ftp/{doc.type_id}/' INTERNET_DRAFT_PATH = '/a/www/ietf-ftp/internet-drafts/' INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/' RFC_PATH = '/a/www/ietf-ftp/rfc/' @@ -265,7 +266,6 @@ AGENDA_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/agenda/%(wg)s.%(ext) MINUTES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/minutes/%(wg)s.%(ext)s' SLIDES_PATH_PATTERN = '/a/www/www6s/proceedings/%(meeting)s/slides/%(wg)s-*' IPR_DOCUMENT_PATH = '/a/www/ietf-ftp/ietf/IPR/' -MATERIALS_PATH = '/a/www/ietf-ftp/materials/' IESG_TASK_FILE = '/a/www/www6/iesg/internal/task.txt' IESG_ROLL_CALL_FILE = '/a/www/www6/iesg/internal/rollcall.txt' IESG_MINUTES_FILE = '/a/www/www6/iesg/internal/minutes.txt' @@ -275,7 +275,6 @@ INTERNET_DRAFT_ARCHIVE_DIR = '/a/www/www6s/draft-archive' # Ideally, more of these would be local -- but since we don't support # versions right now, we'll point to external websites DOC_HREFS = { - "agenda": "/meeting/{meeting}/agenda/{doc.group.acronym}/", #"charter": "/doc/{doc.name}-{doc.rev}/", "charter": "http://www.ietf.org/charter/{doc.name}-{doc.rev}.txt", #"draft": "/doc/{doc.name}-{doc.rev}/", @@ -284,9 +283,13 @@ DOC_HREFS = { # who understands this better can take care of it. #"liai-att": None #"liaison": None + "slides": 'http://www.ietf.org/slides/', +} + +MEETING_DOC_HREFS = { + "agenda": "/meeting/{meeting}/agenda/{doc.group.acronym}/", "minutes": "http://www.ietf.org/proceedings/{meeting}/minutes/{doc.external_url}", "slides": "http://www.ietf.org/proceedings/{meeting}/slides/{doc.external_url}", - "material": "http://www.ietf.org/material/{doc.name}-{doc.rev}", } # Override this in settings_local.py if needed diff --git a/ietf/templates/group/choose_material_type.html b/ietf/templates/group/choose_material_type.html new file mode 100644 index 000000000..e99604630 --- /dev/null +++ b/ietf/templates/group/choose_material_type.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block title %}Upload Material for Group {{ group.acronym }}{% endblock %} + +{% block morecss %} +{{ block.super }} +.material-types li { margin-bottom: 0.5em; } +{% endblock %} + +{% block content %} +{% load ietf_filters %} + +

Upload Material for Group {{ group.acronym }}

+ +

Select what kind of material you wish to upload:

+ +
    + {% for t in material_types %} +
  • {{ t.name }}
    • + {% endfor %} +
+ +{% endblock content %} diff --git a/ietf/templates/group/edit_material.html b/ietf/templates/group/edit_material.html index 29e7e768c..fed4e6f51 100644 --- a/ietf/templates/group/edit_material.html +++ b/ietf/templates/group/edit_material.html @@ -12,8 +12,6 @@ form.upload-material .submit-row td { padding-top: 1em; text-align: right; } {% block content %} {% load ietf_filters %} -
-

Upload Material for Group {{ group.acronym }}

{% if action == "new" %} diff --git a/ietf/templates/group/materials.html b/ietf/templates/group/materials.html index d80251781..4287e1ff0 100644 --- a/ietf/templates/group/materials.html +++ b/ietf/templates/group/materials.html @@ -9,37 +9,41 @@ {% endblock %} {% block group_content %} -{% load ietf_filters %} + {% load ietf_filters %} -

Materials

+ {% if doc_types %} + {% for doc_type, docs in doc_types %} +

{{ doc_type.name }}

- {% if materials %} - +
- - - - - - - {% for d in materials %} - - - - + + + + - {% endfor %} -
TitleRev.Date
- {% if can_manage_materials %} - - edit | - revise - - {% endif %} - - {{ d.title }} - {{ d.rev }}{{ d.time|date:"Y-m-d" }}
TitleRev.Date
+ + {% for d in docs %} + + + {% if can_manage_materials %} + + edit | + revise + + {% endif %} + + {{ d.title }} + + {{ d.rev }} + {{ d.time|date:"Y-m-d" }} + + {% endfor %} + + {% endfor %} {% else %} +

Materials

+

No materials uploaded.

{% endif %}