Return to appropriate page when saving a layer

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

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

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)

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 %}