Browse Source

Change default values while creating new device

devel
bashmak 8 years ago
parent
commit
d8743b6ad4
  1. 10
      devapp/templates/devapp/add_dev.html
  2. 8
      devapp/templates/devapp/custom_dev_page/olt.html
  3. 6
      devapp/views.py

10
devapp/templates/devapp/add_dev.html

@ -48,8 +48,16 @@
<div class="input-group selectajax" data-dst="/dev/search_dev">
<span class="input-group-addon"><span class="glyphicon glyphicon-hdd"></span></span>
<input type="hidden" name="parent_dev" class="selectajax-hid"{% if selected_parent_dev %} value="{{ selected_parent_dev.pk }}"{% endif %}>
{% if selected_parent_dev %}
<button class="selectajax-btn form-control btn btn-default">
{{ selected_parent_dev.ip_address }}: {{ selected_parent_dev.comment }}
</button>
{% else %}
<button class="selectajax-btn form-control btn btn-default hidden"></button>
<input type="text" class="form-control dropdown-toggle selectajax-inp" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}">
{% endif %}
<input type="text" class="form-control dropdown-toggle selectajax-inp{% if selected_parent_dev %} hidden{% endif %}" data-toggle="dropdown" id="id_parent_dev" placeholder="{% trans 'Find the device' %}">
<ul class="dropdown-menu selectajax-ul"></ul>{{ form.parent_dev.errors }}
</div>
</div>

8
devapp/templates/devapp/custom_dev_page/olt.html

@ -6,7 +6,7 @@
<div class="col-sm-12">
<div class="table-responsive">
{% with uptime=dev_manager.uptime %}
{% if uptime %}
{% if uptime %}
{% trans 'Uptime' %} {{ uptime }}
{% endif %}
{% endwith %}
@ -14,7 +14,7 @@
<thead>
<tr>
<th class="col-xs-1">#</th>
<th class="col-xs-1">{% trans 'SNMP Num' %}</th>
<th class="col-xs-1">{% trans 'SNMP Num' %}</th>
<th class="col-xs-4">{% trans 'Name' %}</th>
<th class="col-xs-3">{% trans 'Mac' %}</th>
<th class="col-xs-2">{% trans 'Signal' %}</th>
@ -30,12 +30,12 @@
{% else %}<span class="glyphicon glyphicon-warning-sign text-danger"></span>
{% endif %}
</td>
<td>{{ port.num }}</td>
<td>{{ port.num }}</td>
<td>{{ port.nm }}</td>
<td>{{ port.mac }}</td>
<td>{{ port.signal }}</td>
<td>
<a href="{% url 'devapp:add' grp %}?mac={{ port.mac }}&t=On&c={{ port.nm }}{% if dev.ip_address %}&ip={{ dev.ip_address }}{% endif %}&n={{ port.num }}" title="{% trans 'Create device' %}">
<a href="{% url 'devapp:add' grp %}?mac={{ port.mac }}&t=On&c={{ port.nm }}&pdev={{ dev.pk }}&n={{ port.num }}" title="{% trans 'Create device' %}">
<span class="glyphicon glyphicon-plus"></span>
</a>
</td>

6
devapp/views.py

@ -24,7 +24,7 @@ from guardian.shortcuts import get_objects_for_user
from chatbot.telebot import send_notify
from chatbot.models import ChatException
from jsonview.decorators import json_view
from djing import global_base_views, IP_ADDR_REGEX, ping
from djing import global_base_views, IP_ADDR_REGEX, ping, get_object_or_None
from .models import Device, Port, DeviceDBException, DeviceMonitoringException
from .forms import DeviceForm, PortForm
@ -142,10 +142,12 @@ def dev(request, group_id, device_id=0):
frm = DeviceForm(instance=devinst)
if devinst is None:
parent_device_id = request.GET.get('pdev')
return render(request, 'devapp/add_dev.html', {
'form': frm,
'group': device_group,
'already_dev': already_dev
'already_dev': already_dev,
'selected_parent_dev': get_object_or_None(Device, pk=parent_device_id)
})
else:
return render(request, 'devapp/dev.html', {

Loading…
Cancel
Save