Refactored some document methods to align better with Django's get_absolute_url(), and added Person.get_absolute_uri()

 - Legacy-Id: 17189

Author: levkowetz

ietf/doc/models.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2010-2019, All Rights Reserved
+# Copyright The IETF Trust 2010-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
@@ -189,11 +189,11 @@ def revisions(self):
         return revisions
 
 
-    def href(self, meeting=None):
+    def get_href(self, meeting=None):
         return self._get_ref(meeting=meeting,meeting_doc_refs=settings.MEETING_DOC_HREFS)
 
 
-    def gref(self, meeting=None):
+    def get_versionless_href(self, meeting=None):
         return self._get_ref(meeting=meeting,meeting_doc_refs=settings.MEETING_DOC_GREFS)
 
 
@@ -626,7 +626,7 @@ def __str__(self):
 
     def get_absolute_url(self):
         """
-        Returns an url to the document view.  This differs from .href(),
+        Returns an url to the document view.  This differs from .get_href(),
         which returns an url to the document content.
         """
         if not hasattr(self, '_cached_absolute_url'):

ietf/doc/utils.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2011-2019, All Rights Reserved
+# Copyright The IETF Trust 2011-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -877,7 +877,7 @@ def add_markup(path, doc, lines):
                 # make current draft rev bold
                 line = re.sub(r'>(%s)<'%rev, r'><b>\g<1></b><', line)
             line = re.sub(r'IPR declarations', r'<a class="text-warning" href="%s">IPR declarations</a>'%(ipr_url, ), line)
-            line = line.replace(r'[txt]', r'[<a href="%s">txt</a>]' % doc.href())
+            line = line.replace(r'[txt]', r'[<a href="%s">txt</a>]' % doc.get_href())
             lines[i] = line
         return lines
     #

ietf/doc/views_doc.py

@@ -523,7 +523,7 @@ def document_main(request, name, rev=None):
                                        top=top,
                                        chartering=chartering,
                                        content=content,
-                                       txt_url=doc.href(),
+                                       txt_url=doc.get_href(),
                                        revisions=revisions,
                                        latest_rev=latest_rev,
                                        snapshot=snapshot,
@@ -612,7 +612,7 @@ def document_main(request, name, rev=None):
         content = None
         other_types = []
         globs = glob.glob(pathname + ".*")
-        url = doc.href()
+        url = doc.get_href()
         urlbase, urlext = os.path.splitext(url) 
         for g in globs:
             extension = os.path.splitext(g)[1]
@@ -782,9 +782,9 @@ def document_history(request, name):
             if name.startswith("charter"):
                 url = request.build_absolute_uri(urlreverse('ietf.doc.views_charter.charter_with_milestones_txt', kwargs=dict(name=e.doc.name, rev=e.rev)))
             elif name.startswith("conflict-review"):
-                url = find_history_active_at(e.doc, e.time).href()
+                url = find_history_active_at(e.doc, e.time).get_href()
             elif name.startswith("status-change"):
-                url = find_history_active_at(e.doc, e.time).href()
+                url = find_history_active_at(e.doc, e.time).get_href()
             elif name.startswith("draft") or name.startswith("rfc"):
                 # rfcdiff tool has special support for IDs
                 url = e.doc.name + "-" + e.rev

ietf/meeting/feeds.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# Copyright The IETF Trust 2007-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -27,7 +27,7 @@ def items(self):
                 title=doc.type_id,
                 group_acronym=doc.name.split("-")[2],
                 date=doc.time,
-                # FIXME: why isn't this using gref or href?
+                # FIXME: why isn't this using get_versionless_href or get_href?
                 link=self.base_url + os.path.join(doc.get_file_path(), doc.uploaded_filename)[len(settings.AGENDA_PATH):],
                 author=""
                 )

ietf/meeting/templatetags/proceedings_filters.py

@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2016-2020, All Rights Reserved
 from django import template
 
 import debug       # pyflakes:ignore
@@ -21,4 +22,4 @@ def status_for_meeting(group,meeting):
 
 @register.filter
 def meeting_href(doc,meeting):
-    return doc.href(meeting)
+    return doc.get_href(meeting)

ietf/meeting/tests_views.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2019, All Rights Reserved
+# Copyright The IETF Trust 2009-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -136,7 +136,7 @@ def test_meeting_agenda(self):
         self.assertIn(time_interval, agenda_content)
 
         # Make sure there's a frame for the agenda and it points to the right place
-        self.assertTrue(any([session.materials.get(type='agenda').href() in x.attrib["data-src"] for x in q('tr div.modal-body  div.frame')])) 
+        self.assertTrue(any([session.materials.get(type='agenda').get_href() in x.attrib["data-src"] for x in q('tr div.modal-body  div.frame')])) 
 
         # Make sure undeleted slides are present and deleted slides are not
         self.assertTrue(any([session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().title in x.text for x in q('tr div.modal-body ul a')]))
@@ -187,8 +187,8 @@ def test_meeting_agenda(self):
         self.assertContains(r, "BEGIN:VTIMEZONE")
         self.assertContains(r, "END:VTIMEZONE")        
 
-        self.assertContains(r, session.agenda().href())
-        self.assertContains(r, session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().href())
+        self.assertContains(r, session.agenda().get_href())
+        self.assertContains(r, session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().get_href())
         # TODO - the ics view uses .all on a queryset in a view so it's showing the deleted slides.
         #self.assertNotContains(r, session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().get_absolute_url())
 

ietf/meeting/views.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# Copyright The IETF Trust 2007-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -826,7 +826,7 @@ def week_view(request, num=None, name=None, owner=None):
                 item["room"] = a.timeslot.get_location()
 
             if a.session and a.session.agenda():
-                item["agenda"] = a.session.agenda().href()
+                item["agenda"] = a.session.agenda().get_href()
 
             if a.session.current_status == 'canceled':
                 item["name"] = "CANCELLED - " + item["name"]
@@ -1007,10 +1007,10 @@ def json_agenda(request, num=None ):
         if asgn.timeslot.location:      # Some socials have an assignment but no location
             locations.add(asgn.timeslot.location)
         if asgn.session.agenda():
-            sessdict['agenda'] = asgn.session.agenda().href()
+            sessdict['agenda'] = asgn.session.agenda().get_href()
 
         if asgn.session.minutes():
-            sessdict['minutes'] = asgn.session.minutes().href()
+            sessdict['minutes'] = asgn.session.minutes().get_href()
         if asgn.session.slides():
             sessdict['presentations'] = []
             presentations = SessionPresentation.objects.filter(session=asgn.session, document__type__slug='slides')

ietf/person/models.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2010-2019, All Rights Reserved
+# Copyright The IETF Trust 2010-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -19,6 +19,7 @@
 from django.core.validators import validate_email
 from django.db import models
 from django.template.loader import render_to_string
+from django.urls import reverse as urlreverse
 from django.utils.encoding import python_2_unicode_compatible, smart_bytes
 from django.utils.text import slugify
 
@@ -55,6 +56,8 @@ class Person(models.Model):
 
     def __str__(self):
         return self.plain_name()
+    def get_absolute_url(self):
+        return urlreverse('ietf.person.views.profile', kwargs={'email_or_name': self.name})
     def name_parts(self):
         return name_parts(self.name)
     def ascii_parts(self):

ietf/person/tests.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2014-2019, All Rights Reserved
+# Copyright The IETF Trust 2014-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -10,6 +10,7 @@
 from pyquery import PyQuery
 from io import StringIO
 from django.urls import reverse as urlreverse
+from django.utils.encoding import iri_to_uri
 
 import debug                            # pyflakes:ignore
 
@@ -127,6 +128,10 @@ def test_merge_post(self):
         self.assertContains(r, 'Merged', status_code=200)
         self.assertFalse(Person.objects.filter(pk=p1.pk))
 
+    def test_absolute_url(self):
+        p = PersonFactory()
+        self.assertEqual(p.get_absolute_url(), iri_to_uri('/person/%s' % p.name))
+
 class PersonUtilsTests(TestCase):
     def test_determine_merge_order(self):
         p1 = get_person_no_user()

ietf/secr/templates/proceedings/recording.html

@@ -65,7 +65,7 @@ <h2>{{ meeting }} - Recordings</h2>
              <td>{{ session.group.acronym }}</td>
              <td>{{ session.official_timeslotassignment.timeslot.time|date:"m-d H:i" }}</td>
              <td class="document-name" >{{ recording.name }}</td>
-             <td><a href="{{ recording.href }}">{{ recording.href }}</a></td>
+             <td><a href="{{ recording.get_href }}">{{ recording.get_href }}</a></td>
              <td><a href="{% url 'ietf.secr.proceedings.views.recording_edit' meeting_num=meeting.number name=recording.name %}">Edit</a></td>
              </tr>
              {% endfor %}