diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-06-02 22:24:22 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-11 11:28:14 +0100 |
commit | 5166582791890a27bf4bc9348af6283dbebb020c (patch) | |
tree | 6b50659fa09c1f4a99a066e35557610f3e23f8e7 /layerindex | |
parent | 33f433c1d2318bc191d88035779857498a106efd (diff) | |
download | openembedded-core-contrib-5166582791890a27bf4bc9348af6283dbebb020c.tar.gz |
Add cancel button to edit layer form
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex')
-rw-r--r-- | layerindex/static/css/additional.css | 4 | ||||
-rw-r--r-- | layerindex/views.py | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/layerindex/static/css/additional.css b/layerindex/static/css/additional.css index c62b4625b4..532176f147 100644 --- a/layerindex/static/css/additional.css +++ b/layerindex/static/css/additional.css @@ -135,6 +135,10 @@ padding: 8px; border-top: 1px solid rgb(238, 238, 238); } +.submitbutton { + margin-right: 5px; +} + .hero-evenlyspaced { padding: 35px; } diff --git a/layerindex/views.py b/layerindex/views.py index 3544e2c115..e3bc9a8e27 100644 --- a/layerindex/views.py +++ b/layerindex/views.py @@ -84,6 +84,7 @@ def delete_layer_view(request, template_name, slug): }) def edit_layer_view(request, template_name, slug=None): + return_url = None if slug: # Edit mode branch = Branch.objects.filter(name=request.session.get('branch', 'master'))[:1].get() @@ -92,6 +93,9 @@ def edit_layer_view(request, template_name, slug=None): raise PermissionDenied layerbranch = get_object_or_404(LayerBranch, layer=layeritem, branch=branch) deplistlayers = LayerItem.objects.exclude(id=layeritem.id).order_by('name') + returnto = request.GET.get('returnto', 'layer_item') + if returnto: + return_url = reverse_lazy(returnto, args=(layeritem.name,)) else: # Submit mode branch = Branch.objects.filter(name='master')[:1].get() @@ -165,9 +169,8 @@ 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,))) + if return_url: + return HttpResponseRedirect(return_url) else: form = EditLayerForm(request.user, layerbranch, instance=layeritem) maintainerformset = LayerMaintainerFormSet(instance=layerbranch) @@ -176,6 +179,7 @@ def edit_layer_view(request, template_name, slug=None): 'form': form, 'maintainerformset': maintainerformset, 'deplistlayers': deplistlayers, + 'return_url': return_url, }) def bulk_change_edit_view(request, template_name, pk): |