user_redirect editor view

This commit is contained in:
Laura Klünder 2018-11-26 02:02:00 +01:00
parent 94e87da295
commit 6136bd7c80
2 changed files with 11 additions and 1 deletions

View file

@ -4,7 +4,7 @@ from django.conf.urls import url
from c3nav.editor.views.account import change_password_view, login_view, logout_view, register_view from c3nav.editor.views.account import change_password_view, login_view, logout_view, register_view
from c3nav.editor.views.changes import changeset_detail, changeset_edit from c3nav.editor.views.changes import changeset_detail, changeset_edit
from c3nav.editor.views.edit import edit, graph_edit, level_detail, list_objects, main_index, sourceimage, space_detail from c3nav.editor.views.edit import edit, graph_edit, level_detail, list_objects, main_index, sourceimage, space_detail
from c3nav.editor.views.users import user_detail from c3nav.editor.views.users import user_detail, user_redirect
def add_editor_urls(model_name, parent_model_name=None, with_list=True, explicit_edit=False): def add_editor_urls(model_name, parent_model_name=None, with_list=True, explicit_edit=False):
@ -42,6 +42,7 @@ urlpatterns = [
url(r'^changesets/(?P<pk>[0-9]+)/$', changeset_detail, name='editor.changesets.detail'), url(r'^changesets/(?P<pk>[0-9]+)/$', changeset_detail, name='editor.changesets.detail'),
url(r'^changesets/(?P<pk>[0-9]+)/edit$', changeset_edit, name='editor.changesets.edit'), url(r'^changesets/(?P<pk>[0-9]+)/edit$', changeset_edit, name='editor.changesets.edit'),
url(r'^sourceimage/(?P<filename>[^/]+)$', sourceimage, name='editor.sourceimage'), url(r'^sourceimage/(?P<filename>[^/]+)$', sourceimage, name='editor.sourceimage'),
url(r'^user/$', user_redirect, name='editor.users.redirect'),
url(r'^users/(?P<pk>[0-9]+)/$', user_detail, name='editor.users.detail'), url(r'^users/(?P<pk>[0-9]+)/$', user_detail, name='editor.users.detail'),
url(r'^login$', login_view, name='editor.login'), url(r'^login$', login_view, name='editor.login'),
url(r'^logout$', logout_view, name='editor.logout'), url(r'^logout$', logout_view, name='editor.logout'),

View file

@ -1,6 +1,7 @@
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from c3nav.editor.models import ChangeSet from c3nav.editor.models import ChangeSet
@ -49,3 +50,11 @@ def user_detail(request, pk):
}) })
return render(request, 'editor/user.html', ctx) return render(request, 'editor/user.html', ctx)
@sidebar_view
def user_redirect(request):
user = request.user
if user.is_authenticated:
return redirect(reverse('editor.users.detail', kwargs={'pk': request.user.pk}))
return redirect(reverse('editor.login'))