Merge pull request #4965 from nyaruka/blog-updates

Remove blog redirect pattern

.gitignore

@@ -36,6 +36,7 @@ media/recordings
 media/test_orgs
 media/tmp
 media/attachments
+media/blog
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

temba/contacts/views.py

@@ -1493,6 +1493,7 @@ def post(self, request, *args, **kwargs):
     class List(ContentMenuMixin, SpaMixin, OrgPermsMixin, SmartListView):
         menu_path = "/contact/fields"
         title = _("Fields")
+        default_order = "name"
 
         def build_content_menu(self, menu):
             menu.add_modax(

temba/public/urls.py

@@ -7,7 +7,6 @@
 from .sitemaps import PublicViewSitemap, VideoSitemap
 from .views import (
     Android,
-    Blog,
     DemoGenerateCoupon,
     DemoOrderStatus,
     IndexView,
@@ -24,7 +23,6 @@
 urlpatterns = [
     re_path(r"^$", IndexView.as_view(), {}, "public.public_index"),
     re_path(r"^sitemap\.xml$", sitemap, {"sitemaps": sitemaps}, name="public.sitemaps"),
-    re_path(r"^blog/$", Blog.as_view(), {}, "public.public_blog"),
     re_path(r"^welcome/$", Welcome.as_view(), {}, "public.public_welcome"),
     re_path(r"^android/$", Android.as_view(), {}, "public.public_android"),
     re_path(r"^public/welcome/$", WelcomeRedirect.as_view(), {}, "public.public_welcome_redirect"),

temba/public/views.py

@@ -2,7 +2,6 @@
 
 from smartmin.views import SmartCreateView, SmartCRUDL, SmartFormView, SmartListView, SmartReadView, SmartTemplateView
 
-from django.conf import settings
 from django.http import HttpResponse, HttpResponseRedirect, JsonResponse
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
@@ -21,7 +20,7 @@ class IndexView(NoNavMixin, SmartTemplateView):
     template_name = "public/public_index.html"
 
     def derive_title(self):
-        return f"{self.request.branding['name']} - {self.request.branding['description']}"
+        return f"{self.request.branding['name']}"
 
     def pre_process(self, request, *args, **kwargs):
         response = super().pre_process(request, *args, **kwargs)
@@ -160,11 +159,6 @@ def pre_save(self, obj):
             return obj
 
 
-class Blog(RedirectView):
-    # whitelabels don't have blogs, so we don't use the brand domain here
-    url = "http://blog." + settings.HOSTNAME
-
-
 class DemoGenerateCoupon(View):
     """
     Used to demo webhook calls from sample flow

temba/settings_common.py

@@ -201,7 +201,7 @@
 # other urls to add
 APP_URLS = []
 
-SITEMAP = ("public.public_index", "public.public_blog", "public.video_list", "api")
+SITEMAP = ("public.public_index", "public.video_list", "api")
 
 INSTALLED_APPS = (
     "django.contrib.auth",