NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-01 05:16:26 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge b01aace771 into d5c3f9e780

Browse Source
This commit is contained in:
Stephen 2017-04-13 08:59:00 +00:00 committed by GitHub
commit 28c914356c
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netbox/ipam/forms.py
View File

@ -308,6 +308,8 @@ class PrefixFilterForm(BootstrapMixin, CustomFieldFilterForm):
#
class IPAddressForm(BootstrapMixin, CustomFieldForm):
interface = forms.ModelChoiceField(queryset=Interface.objects.all(), label='Interface',
widget=APISelect(api_url='/api/dcim/devices/{{device}}/interfaces/'))
nat_site = forms.ModelChoiceField(queryset=Site.objects.all(), required=False, label='Site',
widget=forms.Select(attrs={'filter-for': 'nat_device'}))
nat_device = forms.ModelChoiceField(queryset=Device.objects.all(), required=False, label='Device',
@ -317,10 +319,11 @@ class IPAddressForm(BootstrapMixin, CustomFieldForm):
livesearch = forms.CharField(required=False, label='IP Address', widget=Livesearch(
query_key='q', query_url='ipam-api:ipaddress_list', field_to_update='nat_inside', obj_label='address')
)
return_url = forms.CharField(required=False, widget=forms.HiddenInput())
class Meta:
model = IPAddress
fields = ['address', 'vrf', 'tenant', 'status', 'nat_inside', 'description']
fields = ['address', 'vrf', 'tenant', 'status', 'interface', 'nat_inside', 'description']
widgets = {
'nat_inside': APISelect(api_url='/api/ipam/ip-addresses/?device_id={{nat_device}}', display_field='address')
}
@ -330,6 +333,12 @@ class IPAddressForm(BootstrapMixin, CustomFieldForm):
self.fields['vrf'].empty_label = 'Global'
interfaces = Interface.objects.filter(device=self.instance.device)
self.fields['interface'].choices = [
(iface.id, {'label': iface.name, 'disabled': ''}) for iface in interfaces
]
if self.instance.nat_inside:
nat_inside = self.instance.nat_inside

2
netbox/ipam/views.py
View File

@ -645,7 +645,7 @@ class IPAddressEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'ipam.change_ipaddress'
model = IPAddress
form_class = forms.IPAddressForm
fields_initial = ['address', 'vrf']
fields_initial = ['address', 'vrf', 'return_url']
template_name = 'ipam/ipaddress_edit.html'
default_return_url = 'ipam:ipaddress_list'

18
netbox/templates/ipam/ipaddress_edit.html
View File

@ -9,6 +9,9 @@
{% endblock %}
{% block form %}
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}
<div class="panel panel-default">
<div class="panel-heading"><strong>IP Address</strong></div>
<div class="panel-body">
@ -33,18 +36,9 @@
</p>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">Interface</label>
<div class="col-md-9">
<p class="form-control-static">
{% if obj.interface %}
{{ obj.interface }}
{% else %}
<span class="text-muted">None</span>
{% endif %}
</p>
</div>
</div>
{% if obj.interface %}
{% render_field form.interface %}
{% endif %}
{% endif %}
{% render_field form.description %}
</div>

9
netbox/utilities/views.py
View File

@ -176,7 +176,7 @@ class ObjectEditView(View):
'obj': obj,
'obj_type': self.model._meta.verbose_name,
'form': form,
'return_url': self.get_return_url(obj),
'return_url': request.GET.get('return_url') or self.get_return_url(obj),
})
def post(self, request, *args, **kwargs):
@ -207,7 +207,12 @@ class ObjectEditView(View):
if '_addanother' in request.POST:
return redirect(request.path)
return redirect(self.get_return_url(obj))
return_url = form.cleaned_data['return_url']
if return_url and is_safe_url(url=return_url, host=request.get_host()):
return redirect(return_url)
else:
return redirect(self.get_return_url(obj))
return render(request, self.template_name, {
'obj': obj,