Merge lp:~dholbach/developer-ubuntu-com/404-redirect into lp:developer-ubuntu-com

[Daniel Holbach]

[Daniel Holbach (dholbach)]

Maybe we should take a look at https://docs.djangoproject.com/en/dev/ref/contrib/sites/#enabling-the-sites-framework instead?

Unmerged revisions

206. By Daniel Holbach on 2016-04-04

add a try based on RedirectView

205. By Daniel Holbach on 2016-03-31

add simple admin interface, return a proper __str__ for our Redirects

204. By Daniel Holbach on 2016-03-31

add Redirect model

203. By Daniel Holbach on 2016-03-31

manage.py startapp redirects

=== modified file 'developer_portal/settings.py'
--- developer_portal/settings.py	2016-03-23 09:19:28 +0000
+++ developer_portal/settings.py	2016-04-04 15:26:05 +0000
@@ -79,6 +79,8 @@
     'api_docs',
 
     'md_importer',
+
+    'redirects',
 ]
 
 MIDDLEWARE_CLASSES = (

=== modified file 'developer_portal/urls.py'
--- developer_portal/urls.py	2016-01-18 23:54:21 +0000
+++ developer_portal/urls.py	2016-04-04 15:26:05 +0000
@@ -34,6 +34,7 @@
     url(r'^search/', 'developer_portal.views.search', name='search'),
     url(r'^ckeditor/', include('ckeditor_uploader.urls')),
     url(r'^', include('cms.urls')),
+    url(r'^', include('redirects.urls')),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 urlpatterns += patterns('webapp_creator.views',

=== added directory 'redirects'
=== added file 'redirects/__init__.py'
=== added file 'redirects/admin.py'
--- redirects/admin.py	1970-01-01 00:00:00 +0000
+++ redirects/admin.py	2016-04-04 15:26:05 +0000
@@ -0,0 +1,8 @@
+from django.contrib import admin
+
+from .models import Redirect
+
+
[e-mail](Redirect)
+class RedirectAdmin(admin.ModelAdmin):
+    pass

=== added directory 'redirects/migrations'
=== added file 'redirects/migrations/0001_initial.py'
--- redirects/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ redirects/migrations/0001_initial.py	2016-04-04 15:26:05 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Redirect',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('redirect_from', models.CharField(help_text="Which namespace needs the redirect? All subpages will get redirects too. Please note: There's no need to indicate the language (like 'en'), just do , e.g.: scopes", max_length=150)),
+                ('redirect_to', models.CharField(help_text="Where do you want to redirect to? All subpages will get redirects. Please note: There's no need to indicate the language (like 'en'), just do , e.g.: phone/scopes", max_length=150)),
+            ],
+        ),
+    ]

=== added file 'redirects/migrations/__init__.py'
=== added file 'redirects/models.py'
--- redirects/models.py	1970-01-01 00:00:00 +0000
+++ redirects/models.py	2016-04-04 15:26:05 +0000
@@ -0,0 +1,20 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+
+class Redirect(models.Model):
+    redirect_from = models.CharField(
+        max_length=150,
+        help_text=_("Which namespace needs the redirect? All subpages will "
+                    "get redirects too. Please note: There's no need to "
+                    "indicate the language (like 'en'), just do "
+                    ", e.g.: scopes"))
+    redirect_to = models.CharField(
+        max_length=150,
+        help_text=_("Where do you want to redirect to? All subpages will "
+                    "get redirects. Please note: There's no need to "
+                    "indicate the language (like 'en'), just do "
+                    ", e.g.: phone/scopes"))
+
+    def __str__(self):
+        return '{} -- {}'.format(self.redirect_from, self.redirect_to)

=== added file 'redirects/tests.py'
--- redirects/tests.py	1970-01-01 00:00:00 +0000
+++ redirects/tests.py	2016-04-04 15:26:05 +0000
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

=== added file 'redirects/urls.py'
--- redirects/urls.py	1970-01-01 00:00:00 +0000
+++ redirects/urls.py	2016-04-04 15:26:05 +0000
@@ -0,0 +1,16 @@
+from django.conf import settings
+from django.conf.urls import url, patterns
+from django.views.generic.base import RedirectView
+
+from cms.constants import SLUG_REGEXP
+from .views import PageRedirectView
+
+
+if settings.APPEND_SLASH:
+    regexp = r'^(?P<slug>%s)/$' % SLUG_REGEXP
+else:
+    regexp = r'^(?P<slug>%s)$' % SLUG_REGEXP
+
+urlpatterns = patterns('',
+    url(regexp, PageRedirectView.as_view(), name='page-redirect'),
+)

=== added file 'redirects/views.py'
--- redirects/views.py	1970-01-01 00:00:00 +0000
+++ redirects/views.py	2016-04-04 15:26:05 +0000
@@ -0,0 +1,26 @@
+from django.shortcuts import get_object_or_404, render
+from django.views.generic.base import RedirectView
+
+from cms.models import Page
+from cms.utils.page_resolver import get_page_from_path
+
+from .models import Redirect
+
+
+class PageRedirectView(RedirectView):
+    permanent = False
+    query_string = True
+    pattern_name = 'page-redirect'
+
+    def get_redirect_url(self, *args, **kwargs):
+        print('get_redirect_url')
+        for redirect in Redirect.objects.all():
+            new_url = re.sub(
+                '^{}'.format(redirect.redirect_from), redirect.redirect_to,
+                self.url)
+            print(self.url, new_url)
+            page_pk = get_page_from_path(new_url).pk
+            page = get_object_or_404(Page, pk=page_pk)
+        return super(
+            ArticleCounterRedirectView,
+            self).get_redirect_url(*args, **kwargs)