June updates (#751)

* Add pointer from API docs to tutorial #650

* Sorting by clicking table headers should use local-compare #356

* Mark IXP peering LAN as bogon #352

* Add help text to "Add (Facility, Network, Exchange)" tab #669

* Add Looking Glass field to the IX object #672

* Add read-only Superuser #679

* Make spelling of traffic levels consistent #519 (#723)

* Offer 2FA (#290)

* Show "Last Updated" fields on fac, ix, org records (#526)

* Enable sort and reverse sort of IP column in IX display (#72)

* IRR validation not handling unexpected characters gracefully (#712)

* Support alternative direction of writing, e.g. Arabic (#618)

* Undeleting an ixlan with an emtpy IPv4 XOR IPv6 field throws a silly error (#644)

* Changing org while adding net results in 500 #654

* missing delete button for organisations (#121)

* When changing owner of an ix admin GUI borks because of "Ixlan for exchange already exists" #666

* Selection should only present undeleted objects (#664)

* change default encoding of API calls to 'utf-8' #663

* Posting https://www.peeringdb.com onto social media doesn't select a good preview image #537

* Revert "Add Looking Glass field to the IX object #672"

This reverts commit 4daf2520043c241fabe9a521757efa86a274e28a.

Conflicts:
	peeringdb_server/migrations/0037_ix_looking_glass.py
	peeringdb_server/views.py

* 500 Internal Error when creating IX where prefix already exists elsewhere #718

* Fix graceful restore of soft-deleted objects with translation active (#580)

* Don't return any POC data with status=deleted #569
Hard delete soft-deleted pocs after grace period #566

* django-peeringdb from github@2.0.0.2-beta

Co-authored-by: Stefan Pratter <stefan@20c.com>

mainsite/urls.py

@@ -3,6 +3,10 @@ from django.conf.urls.static import static
 from django.conf import settings
 from django.views.generic.base import RedirectView
 
+from peeringdb_server.views import LoginView
+
+from two_factor.urls import urlpatterns as tf_urls
+
 # auto admin
 from django.contrib import admin
 
@@ -10,13 +14,22 @@ admin.autodiscover()
 
 import peeringdb_server.urls
 
+from peeringdb_server.autocomplete_views import GrappelliHandlerefAutocomplete
+
 import allauth.account.views
 
-from peeringdb_server.views import view_login
-
+tf_urls[0][0] = url(
+    regex=r'^account/login/$',
+    view=LoginView.as_view(),
+    name='login',
+)
 
 urlpatterns = [
+    # override grappelli autocomplete handler
+    url(r'^grappelli/lookup/autocomplete/$', GrappelliHandlerefAutocomplete.as_view(), name="grp_autocomplete_lookup"),
+    # grappelli admin interface improvements
     url(r"^grappelli/", include("grappelli.urls")),
+
     # FIXME: adapt to DAL3 changes
     # url(r'^autocomplete/',  include('dal.urls')),
     # FIXME: can remove this if we upgrade to allauth > 0.24.2, upgrade
@@ -33,9 +46,8 @@ urlpatterns = [
             url="/cp/peeringdb_server/organization/org-merge-tool", permanent=False
         ),
     ),
-    # we want to use default pdb login for admin area, since that is rate limited.
-    url(r"^cp/login/", view_login),
     url(r"^cp/", admin.site.urls),
+    url(r'', include(tf_urls)),
 ]
 urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)