aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-06-02 22:05:49 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-08-11 11:28:14 +0100
commit33f433c1d2318bc191d88035779857498a106efd (patch)
tree74902ad0ade9c75e7f6262f1d45056295745d543
parent9156b1c0de51e9b83011c847d6bdddf916b786b2 (diff)
downloadopenembedded-core-contrib-33f433c1d2318bc191d88035779857498a106efd.tar.gz
Return to appropriate page when saving a layer
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--TODO1
-rw-r--r--layerindex/views.py3
-rw-r--r--templates/layerindex/reviewdetail.html2
3 files changed, 4 insertions, 2 deletions
diff --git a/TODO b/TODO
index bc2fcd6395..6f7b586fe9 100644
--- a/TODO
+++ b/TODO
@@ -17,7 +17,6 @@ Later:
* Usage links in list page?
* Subdirs in list page?
* Avoid page content changing size depending on whether scrollbar is there or not?
-* Return to last page (review/detail) after editing (with success alert)?
* Cancel button on edit form?
* Query backend service? i.e. special URL to query information for external apps/scripts
* Add comparison to duplicates page
diff --git a/layerindex/views.py b/layerindex/views.py
index 70ba3e1b4f..3544e2c115 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -165,6 +165,9 @@ def edit_layer_view(request, template_name, slug=None):
msg.send()
return HttpResponseRedirect(reverse('submit_layer_thanks'))
messages.success(request, 'Layer %s saved successfully.' % layeritem.name)
+ returnto = request.GET.get('returnto', 'layer_item')
+ if returnto:
+ return HttpResponseRedirect(reverse_lazy(returnto, args=(layeritem.name,)))
else:
form = EditLayerForm(request.user, layerbranch, instance=layeritem)
maintainerformset = LayerMaintainerFormSet(instance=layerbranch)
diff --git a/templates/layerindex/reviewdetail.html b/templates/layerindex/reviewdetail.html
index 6769d2cf35..a48513407d 100644
--- a/templates/layerindex/reviewdetail.html
+++ b/templates/layerindex/reviewdetail.html
@@ -35,7 +35,7 @@
{% if user.is_authenticated %}
<span class="pull-right">
{% if perms.layerindex.publish_layer or useredit %}
- <a href="{% url edit_layer layeritem.name %}" class="btn">Edit layer</a>
+ <a href="{% url edit_layer layeritem.name %}?returnto=layer_review" class="btn">Edit layer</a>
{% if layeritem.layernote_set.count = 0 %}
<a href="{% url add_layernote layeritem.name %}" class="btn">Add note</a>
{% endif %}