MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add cancel button to edit layer form

Browse Source 
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2013-06-02 22:24:22 +01:00
parent 33f433c1d2
commit 5166582791
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -17,7 +17,6 @@ Later:
* Usage links in list page? * Usage links in list page?
* Subdirs in list page? * Subdirs in list page?
* Avoid page content changing size depending on whether scrollbar is there or not? * Avoid page content changing size depending on whether scrollbar is there or not?
* Cancel button on edit form?
* Query backend service? i.e. special URL to query information for external apps/scripts * Query backend service? i.e. special URL to query information for external apps/scripts
* Add comparison to duplicates page * Add comparison to duplicates page
* Dynamic loading/filtering for recipes list * Dynamic loading/filtering for recipes list

4
layerindex/static/css/additional.css
View File

@ -135,6 +135,10 @@ padding: 8px;
border-top: 1px solid rgb(238, 238, 238); border-top: 1px solid rgb(238, 238, 238);
} }
.submitbutton {
margin-right: 5px;
}
.hero-evenlyspaced { .hero-evenlyspaced {
padding: 35px; padding: 35px;
} }

10
layerindex/views.py
View File

@ -84,6 +84,7 @@ def delete_layer_view(request, template_name, slug):
}) })
def edit_layer_view(request, template_name, slug=None): def edit_layer_view(request, template_name, slug=None):
return_url = None
if slug: if slug:
# Edit mode # Edit mode
branch = Branch.objects.filter(name=request.session.get('branch', 'master'))[:1].get() 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 raise PermissionDenied
layerbranch = get_object_or_404(LayerBranch, layer=layeritem, branch=branch) layerbranch = get_object_or_404(LayerBranch, layer=layeritem, branch=branch)
deplistlayers = LayerItem.objects.exclude(id=layeritem.id).order_by('name') 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: else:
# Submit mode # Submit mode
branch = Branch.objects.filter(name='master')[:1].get() branch = Branch.objects.filter(name='master')[:1].get()
@ -165,9 +169,8 @@ def edit_layer_view(request, template_name, slug=None):
msg.send() msg.send()
return HttpResponseRedirect(reverse('submit_layer_thanks')) return HttpResponseRedirect(reverse('submit_layer_thanks'))
messages.success(request, 'Layer %s saved successfully.' % layeritem.name) messages.success(request, 'Layer %s saved successfully.' % layeritem.name)
returnto = request.GET.get('returnto', 'layer_item') if return_url:
if returnto: return HttpResponseRedirect(return_url)
return HttpResponseRedirect(reverse_lazy(returnto, args=(layeritem.name,)))
else: else:
form = EditLayerForm(request.user, layerbranch, instance=layeritem) form = EditLayerForm(request.user, layerbranch, instance=layeritem)
maintainerformset = LayerMaintainerFormSet(instance=layerbranch) maintainerformset = LayerMaintainerFormSet(instance=layerbranch)
@ -176,6 +179,7 @@ def edit_layer_view(request, template_name, slug=None):
'form': form, 'form': form,
'maintainerformset': maintainerformset, 'maintainerformset': maintainerformset,
'deplistlayers': deplistlayers, 'deplistlayers': deplistlayers,
'return_url': return_url,
}) })
def bulk_change_edit_view(request, template_name, pk): def bulk_change_edit_view(request, template_name, pk):

3
templates/layerindex/editlayer.html
View File

@ -147,7 +147,8 @@
<div class="submitbuttons"> <div class="submitbuttons">
{% block submitbuttons %} {% block submitbuttons %}
<input type="submit" value="Save layer" class="btn btn-primary btn-large" /> <input type="submit" value="Save layer" class="btn btn-primary btn-large submitbutton" />
<a href="{{ return_url }}" class="btn btn-large">Cancel</a>
{% endblock %} {% endblock %}
</div> </div>
</form> </form>