diff --git a/cao_sunyata/templates/blog_edit.jinja2 b/cao_sunyata/templates/blog_edit.jinja2 index 8df905a..56f06ca 100644 --- a/cao_sunyata/templates/blog_edit.jinja2 +++ b/cao_sunyata/templates/blog_edit.jinja2 @@ -59,7 +59,7 @@


- Retour + Retour {% if blog_id != '0' %} diff --git a/cao_sunyata/views/blog.py b/cao_sunyata/views/blog.py index e07e7a3..88d29e7 100644 --- a/cao_sunyata/views/blog.py +++ b/cao_sunyata/views/blog.py @@ -84,14 +84,17 @@ def blog_edit(request): entry['creator'] = request.authenticated_userid entry['editor'] = '' page_title = 'Nouvelle page' + url_retour = request.route_url('topic', topic=topic) else: # modify post entry = get_entries_by_id(request, blog_id) if not entry: request.session.flash("Page non trouvée : %s" % blog_id, 'warning') - return HTTPFound(location=request.route_url('topic', topic=topic)) + return HTTPFound(url_retour) page_title = 'Modifier : ' + entry.title + entry_slug = urlify(entry.title) + url_retour = request.route_url('blog', id=blog_id, slug=entry_slug) if 'form.submitted' in request.params: new_values = {} @@ -109,16 +112,17 @@ def blog_edit(request): new_values['topic_id'] = topic new_values['editor'] = request.authenticated_userid update_entry(request, blog_id, new_values) - return HTTPFound(location=request.route_url('topic', topic=topic)) + return HTTPFound(location=url_retour) if 'form.deleted' in request.params: delete_entry(request, blog_id) request.session.flash("La page a été supprimée avec succès.", 'success') - return HTTPFound(location=request.route_url('topic', topic=topic)) + return HTTPFound(location=url_retour) return { 'page_title': page_title, 'url': url, + 'url_retour': url_retour, 'blog_id': blog_id, 'entry': entry, 'tags': tags,