Browse Source

make snmp fill by json

devel
Dmitry Novikov 7 years ago
parent
commit
61f9714149
  1. 4
      devapp/dev_types.py
  2. 2
      devapp/templates/devapp/dev.html
  3. 3
      devapp/views.py
  4. 4
      static/js/my.js

4
devapp/dev_types.py

@ -528,7 +528,7 @@ class ZteOnuDevice(OnuDevice):
return '\n'.join(i for i in r if i) return '\n'.join(i for i in r if i)
def register_device(self, extra_data: Dict): def register_device(self, extra_data: Dict):
_reg_dev_zte(self.db_instance, extra_data, register_f660_onu)
return _reg_dev_zte(self.db_instance, extra_data, register_f660_onu)
def get_fiber_str(self): def get_fiber_str(self):
dev = self.db_instance dev = self.db_instance
@ -550,7 +550,7 @@ class ZteF601(ZteOnuDevice):
description = 'Zte ONU F601' description = 'Zte ONU F601'
def register_device(self, extra_data: Dict): def register_device(self, extra_data: Dict):
_reg_dev_zte(self.db_instance, extra_data, register_f601_onu)
return _reg_dev_zte(self.db_instance, extra_data, register_f601_onu)
class HuaweiSwitch(EltexSwitch): class HuaweiSwitch(EltexSwitch):

2
devapp/templates/devapp/dev.html

@ -70,7 +70,7 @@
</a> </a>
{% endif %} {% endif %}
{% if perms.devapp.change_device %} {% if perms.devapp.change_device %}
<a href="{% url 'devapp:dev_register' grp_id dev.pk %}" class="btn btn-default btn-cmd">
<a href="{% url 'devapp:dev_register' grp_id dev.pk %}" class="btn btn-default btn-cmd" data-form-val="#{{ form.snmp_extra.id_for_label }}">
<span class="glyphicon glyphicon-fire"></span> {% trans 'Register device' %} <span class="glyphicon glyphicon-fire"></span> {% trans 'Register device' %}
</a> </a>
<a href="{% url 'devapp:extra_data_edit' grp_id dev.pk %}" class="btn btn-default btn-modal"> <a href="{% url 'devapp:extra_data_edit' grp_id dev.pk %}" class="btn btn-default btn-modal">

3
devapp/views.py

@ -828,5 +828,6 @@ def register_device(request, group_id: int, device_id: int):
text = format_msg(msg='ok', icon='ok') text = format_msg(msg='ok', icon='ok')
return { return {
'status': status, 'status': status,
'dat': text
'dat': text,
'extra_form_val': device.snmp_extra
} }

4
static/js/my.js

@ -277,6 +277,7 @@ $(document).ready(function () {
// button that send command and return response of that // button that send command and return response of that
$('.btn-cmd').on('click', function(){ $('.btn-cmd').on('click', function(){
var cmd_param = $(this).attr('data-param'); var cmd_param = $(this).attr('data-param');
var form_val = $(this).attr('data-form-val');
var self = $(this); var self = $(this);
self.removeClass('btn-default'); self.removeClass('btn-default');
self.removeClass('btn-danger'); self.removeClass('btn-danger');
@ -290,6 +291,9 @@ $(document).ready(function () {
else else
self.addClass('btn-danger'); self.addClass('btn-danger');
self.html(r.dat); self.html(r.dat);
if(form_val){
$(form_val).val(r.extra_form_val);
}
}); });
return false; return false;
}); });

Loading…
Cancel
Save