merge forward complete

 - Legacy-Id: 8354

Author: rjsparks

ietf/doc/migrations/0020_archive_slides.py

@@ -171,6 +171,15 @@ def active_ballot(self):
             return None
 
     def meeting_related(self):
+        if self.type_id in ("agenda","minutes",):
+            return (self.name.split("-")[1] == "interim"
+                   or (self.session_set.exists() if isinstance(self, Document) else self.doc.session_set.exists()))
+        elif self.type_id in ("slides",):
+            return (self.name.split("-")[1] == "interim"
+                   or (self.get_state('slides') in ("sessonly","archived") ))
+        else:
+            return False
+
         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())))

ietf/doc/models.py

@@ -447,7 +447,11 @@ def format_history_text(text):
     if text.startswith("This was part of a ballot set with:"):
         full = urlize_ietf_docs(full)
 
-    full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(full)))))
+    return format_snippet(full)
+
+@register.filter
+def format_snippet(text): 
+    full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(text)))))
     snippet = truncatewords_html(full, 25)
     if snippet != full:
         return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s</div>' % (snippet, full))

ietf/doc/templatetags/ietf_filters.py

@@ -267,7 +267,8 @@ def concluded_groups(request):
                   dict(group_types=group_types))
 
 def get_group_materials(group):
-    return Document.objects.filter(group=group, type__in=group.features.material_types, session=None).exclude(states__slug="deleted")
+#   return Document.objects.filter(group=group, type__in=group.features.material_types, session=None).exclude(states__slug="deleted")
+    return Document.objects.filter(group=group, type__in=group.features.material_types).exclude(states__slug="deleted")
 
 def construct_group_menu_context(request, group, selected, group_type, others):
     """Return context with info for the group menu filled in."""
@@ -450,6 +451,8 @@ def materials(request, acronym, group_type=None):
         if d.type not in doc_types:
             doc_types[d.type] = []
         doc_types[d.type].append(d)
+        # This needs to be better - probably looking at ScheduledSession, and perhaps ignoring future Sessions
+        d.last_presented = d.sessionpresentation_set.order_by('-session__meeting__date').first()
 
     return render(request, 'group/materials.html',
                   construct_group_menu_context(request, group, "materials", group_type, {

ietf/group/info.py

@@ -777,6 +777,18 @@ def json_dict(self, host_scheme):
         ct1['meeting_href'] = urljoin(host_scheme, self.meeting.json_url())
         return ct1
 
+
+class SessionPresentation(models.Model):
+    session = models.ForeignKey('Session')
+    document = models.ForeignKey(Document)
+    rev = models.CharField(verbose_name="revision", max_length=16, blank=True)
+
+    class Meta:
+        db_table = 'meeting_session_materials'
+
+    def __unicode__(self):
+        return u"%s -> %s-%s" % (self.session, self.document.name, self.rev)
+
 constraint_cache_uses = 0
 constraint_cache_initials = 0
 
@@ -800,7 +812,7 @@ class Session(models.Model):
     scheduled = models.DateTimeField(null=True, blank=True)
     modified = models.DateTimeField(default=datetime.datetime.now)
 
-    materials = models.ManyToManyField(Document, blank=True)
+    materials = models.ManyToManyField(Document, through=SessionPresentation, blank=True)
     resources = models.ManyToManyField(ResourceAssociation)
 
     unique_constraints_dict = None
@@ -1172,4 +1184,3 @@ def badness_fast(self, timeslot, scheduleslot, session_pk_list):
         if self.badness_test(1):
             self.badness_log(1, "badgroup: %s badness = %u\n" % (self.group.acronym, badness))
         return badness
-

ietf/meeting/migrations/0019_version_materials.py

@@ -2,7 +2,7 @@
 
 from ietf.doc.models import Document, State
 from ietf.group.models import Group
-from ietf.meeting.models import Meeting, Room, TimeSlot, Session, Schedule, ScheduledSession, ResourceAssociation
+from ietf.meeting.models import Meeting, Room, TimeSlot, Session, Schedule, ScheduledSession, ResourceAssociation, SessionPresentation
 from ietf.name.models import RoomResourceName
 from ietf.person.models import Person
 from ietf.utils.test_data import make_test_data
@@ -46,15 +46,15 @@ def make_meeting_test_data():
 
     doc = Document.objects.create(name='agenda-mars-ietf-42', type_id='agenda', title="Agenda", external_url="agenda-mars")
     doc.set_state(State.objects.get(type=doc.type_id, slug="active"))
-    mars_session.materials.add(doc)
+    mars_session.sessionpresentation_set.add(SessionPresentation(session=mars_session,document=doc,rev=doc.rev))
 
     doc = Document.objects.create(name='minutes-mars-ietf-42', type_id='minutes', title="Minutes", external_url="minutes-mars")
     doc.set_state(State.objects.get(type=doc.type_id, slug="active"))
-    mars_session.materials.add(doc)
+    mars_session.sessionpresentation_set.add(SessionPresentation(session=mars_session,document=doc,rev=doc.rev))
 
     doc = Document.objects.create(name='slides-mars-ietf-42', type_id='slides', title="Slideshow", external_url="slides-mars")
     doc.set_state(State.objects.get(type=doc.type_id, slug="active"))
-    mars_session.materials.add(doc)
+    mars_session.sessionpresentation_set.add(SessionPresentation(session=mars_session,document=doc,rev=doc.rev))
 
     return meeting
 

ietf/meeting/migrations/0020_snapshot_material_revisions.py

@@ -23,7 +23,7 @@
 from ietf.doc.models import Document, DocAlias, DocEvent, State, NewRevisionDocEvent
 from ietf.group.models import Group
 from ietf.ietfauth.utils import has_role
-from ietf.meeting.models import Meeting, Session, TimeSlot, ScheduledSession
+from ietf.meeting.models import Meeting, Session, TimeSlot, ScheduledSession, SessionPresentation
 from ietf.secr.proceedings.forms import EditSlideForm, InterimMeetingForm, ReplaceSlideForm, UnifiedUploadForm
 from ietf.secr.proceedings.proc_utils import ( gen_acknowledgement, gen_agenda, gen_areas, gen_attendees,
     gen_group_pages, gen_index, gen_irtf, gen_overview, gen_plenaries, gen_progress, gen_research,
@@ -842,9 +842,9 @@ def upload_unified(request, meeting_num, acronym=None, session_id=None):
             # for the current meeting (until tools support different materials for diff sessions)
             if sessions:
                 for s in sessions:
-                    s.materials.add(doc)
+                    s.materials.sessionpresentation_set.add(SessionPresentation(session=s,document=doc,rev=doc.rev))
             else:
-                session.materials.add(doc)
+                session.materials.sessionpresentation_set.add(SessionPresentation(session=session,document=doc,rev=doc.rev))
 
             # create NewRevisionDocEvent instead of uploaded, per Ole
             NewRevisionDocEvent.objects.create(type='new_revision',

ietf/meeting/models.py

@@ -77,5 +77,5 @@ <h2>Document history</h2>
 {% endblock content %}
 
 {% block content_end %}
-<script type="text/javascript" src="/js/history.js"></script>
+<script type="text/javascript" src="/js/snippet.js"></script>
 {% endblock content_end %}