mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixed bug where placeholder prefixes were being included as 'None' in pk_all for bulk edit/delete

Browse Source
This commit is contained in:
Jeremy Stretch
2016-06-16 09:27:33 -04:00
parent 0b2e66927e
commit 4bb9363e81
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/templates/dcim/inc/device_table.html
View File

@ -4,7 +4,7 @@
<form method="post" class="form form-horizontal"> <form method="post" class="form form-horizontal">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="redirect_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" /> <input type="hidden" name="redirect_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" />
<input type="hidden" name="pk_all" value="{% for row in table.rows %}{{ row.record.pk }}{% if not forloop.last %},{% endif %}{% endfor %}" /> <input type="hidden" name="pk_all" value="{% for row in table.rows %}{{ row.record.pk|default:'' }}{% if not forloop.last %},{% endif %}{% endfor %}" />
{% render_table table table_template|default:'table.html' %} {% render_table table table_template|default:'table.html' %}
{% if perms.dcim.add_interface %} {% if perms.dcim.add_interface %}
<button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_add' %}" class="btn btn-primary btn-sm"> <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_add' %}" class="btn btn-primary btn-sm">

2
netbox/templates/utilities/obj_table.html
View File

@ -4,7 +4,7 @@
<form method="post" class="form form-horizontal"> <form method="post" class="form form-horizontal">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="redirect_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" /> <input type="hidden" name="redirect_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" />
<input type="hidden" name="pk_all" value="{% for row in table.rows %}{{ row.record.pk }}{% if not forloop.last %},{% endif %}{% endfor %}" /> <input type="hidden" name="pk_all" value="{% for row in table.rows %}{{ row.record.pk|default:'' }}{% if not forloop.last %},{% endif %}{% endfor %}" />
{% render_table table table_template|default:'table.html' %} {% render_table table table_template|default:'table.html' %}
{% if bulk_edit_url and table.model|user_can_change:request.user %} {% if bulk_edit_url and table.model|user_can_change:request.user %}
<button type="submit" name="_edit" formaction="{% url bulk_edit_url %}" class="btn btn-warning btn-sm"> <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}" class="btn btn-warning btn-sm">

4
netbox/utilities/views.py
View File

@ -261,7 +261,7 @@ class BulkEditView(View):
redirect_url = reverse(self.default_redirect_url) redirect_url = reverse(self.default_redirect_url)
if request.POST.get('_all'): if request.POST.get('_all'):
pk_list = request.POST.get('pk_all').split(',') pk_list = [x for x in request.POST.get('pk_all').split(',') if x]
else: else:
pk_list = request.POST.getlist('pk') pk_list = request.POST.getlist('pk')
@ -318,7 +318,7 @@ class BulkDeleteView(View):
redirect_url = reverse(self.default_redirect_url) redirect_url = reverse(self.default_redirect_url)
if request.POST.get('_all'): if request.POST.get('_all'):
pk_list = request.POST.get('pk_all').split(',') pk_list = [x for x in request.POST.get('pk_all').split(',') if x]
else: else:
pk_list = request.POST.getlist('pk') pk_list = request.POST.getlist('pk')