diff --git a/devapp/dev_types.py b/devapp/dev_types.py index 29f9df7..bdcb990 100644 --- a/devapp/dev_types.py +++ b/devapp/dev_types.py @@ -528,7 +528,7 @@ class ZteOnuDevice(OnuDevice): return '\n'.join(i for i in r if i) 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): dev = self.db_instance @@ -550,7 +550,7 @@ class ZteF601(ZteOnuDevice): description = 'Zte ONU F601' 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): diff --git a/devapp/templates/devapp/dev.html b/devapp/templates/devapp/dev.html index d7a6588..fe85dba 100644 --- a/devapp/templates/devapp/dev.html +++ b/devapp/templates/devapp/dev.html @@ -70,7 +70,7 @@ {% endif %} {% if perms.devapp.change_device %} - + {% trans 'Register device' %} diff --git a/devapp/views.py b/devapp/views.py index c78532d..50199a3 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -828,5 +828,6 @@ def register_device(request, group_id: int, device_id: int): text = format_msg(msg='ok', icon='ok') return { 'status': status, - 'dat': text + 'dat': text, + 'extra_form_val': device.snmp_extra } diff --git a/static/js/my.js b/static/js/my.js index c785ca9..e41306b 100644 --- a/static/js/my.js +++ b/static/js/my.js @@ -277,6 +277,7 @@ $(document).ready(function () { // button that send command and return response of that $('.btn-cmd').on('click', function(){ var cmd_param = $(this).attr('data-param'); + var form_val = $(this).attr('data-form-val'); var self = $(this); self.removeClass('btn-default'); self.removeClass('btn-danger'); @@ -290,6 +291,9 @@ $(document).ready(function () { else self.addClass('btn-danger'); self.html(r.dat); + if(form_val){ + $(form_val).val(r.extra_form_val); + } }); return false; });