mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-24 17:38:37 -06:00
Closes #1100: Add a "view all" link to completed bulk import views is_pool for prefixes
This commit is contained in:
parent
379c24a012
commit
3c631902e1
@ -924,6 +924,7 @@ class ConsoleConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView):
|
|||||||
form = forms.ConsoleConnectionImportForm
|
form = forms.ConsoleConnectionImportForm
|
||||||
table = tables.ConsoleConnectionTable
|
table = tables.ConsoleConnectionTable
|
||||||
template_name = 'dcim/console_connections_import.html'
|
template_name = 'dcim/console_connections_import.html'
|
||||||
|
default_return_url = 'dcim:console_connections_list'
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1117,6 +1118,7 @@ class PowerConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView):
|
|||||||
form = forms.PowerConnectionImportForm
|
form = forms.PowerConnectionImportForm
|
||||||
table = tables.PowerConnectionTable
|
table = tables.PowerConnectionTable
|
||||||
template_name = 'dcim/power_connections_import.html'
|
template_name = 'dcim/power_connections_import.html'
|
||||||
|
default_return_url = 'dcim:power_connections_list'
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -1528,6 +1530,7 @@ class InterfaceConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView
|
|||||||
form = forms.InterfaceConnectionImportForm
|
form = forms.InterfaceConnectionImportForm
|
||||||
table = tables.InterfaceConnectionTable
|
table = tables.InterfaceConnectionTable
|
||||||
template_name = 'dcim/interface_connections_import.html'
|
template_name = 'dcim/interface_connections_import.html'
|
||||||
|
default_return_url = 'dcim:interface_connections_list'
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -183,6 +183,7 @@ def secret_import(request):
|
|||||||
|
|
||||||
return render(request, 'import_success.html', {
|
return render(request, 'import_success.html', {
|
||||||
'table': table,
|
'table': table,
|
||||||
|
'return_url': 'secrets:secret_list',
|
||||||
})
|
})
|
||||||
|
|
||||||
except IntegrityError as e:
|
except IntegrityError as e:
|
||||||
@ -193,7 +194,7 @@ def secret_import(request):
|
|||||||
|
|
||||||
return render(request, 'secrets/secret_import.html', {
|
return render(request, 'secrets/secret_import.html', {
|
||||||
'form': form,
|
'form': form,
|
||||||
'return_url': reverse('secrets:secret_list'),
|
'return_url': 'secrets:secret_list',
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,7 +12,9 @@
|
|||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% render_form form %}
|
{% render_form form %}
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<button type="submit" class="btn btn-primary">Submit</button>
|
<div class="col-md-12 text-right">
|
||||||
|
<button type="submit" class="btn btn-primary">Submit</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -20,7 +20,9 @@
|
|||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% render_form form %}
|
{% render_form form %}
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<button type="submit" class="btn btn-primary">Submit</button>
|
<div class="col-md-12 text-right">
|
||||||
|
<button type="submit" class="btn btn-primary">Submit</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -12,7 +12,9 @@
|
|||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% render_form form %}
|
{% render_form form %}
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<button type="submit" class="btn btn-primary">Submit</button>
|
<div class="col-md-12 text-right">
|
||||||
|
<button type="submit" class="btn btn-primary">Submit</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -4,10 +4,13 @@
|
|||||||
{% block title %}Import Completed{% endblock %}
|
{% block title %}Import Completed{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>Import Completed</h1>
|
<h1>{% block title %}Import Completed{% endblock %}</h1>
|
||||||
{% render_table table %}
|
{% render_table table %}
|
||||||
<a href="{{ request.path }}" class="btn btn-primary">
|
<a href="{{ request.path }}" class="btn btn-primary">
|
||||||
<span class="fa fa-download" aria-hidden="true"></span>
|
<span class="fa fa-download" aria-hidden="true"></span>
|
||||||
Import more
|
Import more
|
||||||
</a>
|
</a>
|
||||||
|
{% if return_url %}
|
||||||
|
<a href="{% url return_url %}" class="btn btn-default">View All</a>
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -395,6 +395,7 @@ class BulkImportView(View):
|
|||||||
|
|
||||||
return render(request, "import_success.html", {
|
return render(request, "import_success.html", {
|
||||||
'table': obj_table,
|
'table': obj_table,
|
||||||
|
'return_url': self.default_return_url,
|
||||||
})
|
})
|
||||||
|
|
||||||
except IntegrityError as e:
|
except IntegrityError as e:
|
||||||
|
Loading…
Reference in New Issue
Block a user