From 2b53535fadfabbd4dbf79f3bbc0d6e5f0ad08792 Mon Sep 17 00:00:00 2001 From: Juan Antonio Martinez Date: Wed, 22 Mar 2017 12:35:01 +0100 Subject: [PATCH] Fix missing combobox 'valueField' item. update (again) database. Fix version and revision number --- agility/console/dialogs/dlg_chperros.inc | 11 +- agility/console/dialogs/dlg_jornadas.inc | 4 +- agility/console/dialogs/dlg_perros.inc | 3 +- agility/console/dialogs/dlg_usuarios.inc | 2 +- agility/console/dialogs/infomanga.php | 32 +-- agility/index.php | 2 +- agility/livestream/index.php | 2 +- agility/server/auth/system.ini | 4 +- agility/videowall/index.php | 2 +- extras/agility.sql | 251 ++++++++++++----------- 10 files changed, 160 insertions(+), 153 deletions(-) diff --git a/agility/console/dialogs/dlg_chperros.inc b/agility/console/dialogs/dlg_chperros.inc index f140f66de..3eaf599b3 100644 --- a/agility/console/dialogs/dlg_chperros.inc +++ b/agility/console/dialogs/dlg_chperros.inc @@ -49,7 +49,7 @@ $config =Config::getInstance();
- @@ -104,7 +104,11 @@ $config =Config::getInstance(); // datos del formulario de nuevo/edit perros // - declaracion del formulario - $('#chperros-form').form(); + $('#chperros-form').form({ + onLoadSuccess: function(data) { + $('#chperros-Genero').combobox('setValue',data.Genero); + } + }); // - botones addTooltip($('#chperros-clearBtn').linkbutton(),''); addTooltip($('#chperros-newBtn').linkbutton(),''); @@ -113,6 +117,7 @@ $config =Config::getInstance(); $('#chperros-clearBtn').bind('click',function() { $('#chperros-header').form('clear'); // empty form $('#chperros-form').form('reset'); // restore to initial values + $('#chperros-Genero').combobox('setValue','-'); }); // campos del formulario @@ -171,7 +176,7 @@ $config =Config::getInstance(); $('#chperros-Raza').textbox(); $('#chperros-LOE_RRC').textbox(); $('#chperros-Licencia').textbox(); - $('#chperros-Genero').combobox({panelHeight:'auto'}); + $('#chperros-Genero').combobox({valueField:'value',panelHeight:'auto'}); $('#chperros-Grados_Perro').combobox({ panelHeight: 'auto', diff --git a/agility/console/dialogs/dlg_jornadas.inc b/agility/console/dialogs/dlg_jornadas.inc index 8a10b28bd..330bd3b86 100644 --- a/agility/console/dialogs/dlg_jornadas.inc +++ b/agility/console/dialogs/dlg_jornadas.inc @@ -257,7 +257,7 @@ $config =Config::getInstance(); required: true, validType: 'length[1,255]' }); - $('#jornadas-MangasPreAgility').combobox({panelHeight:'auto'}); + $('#jornadas-MangasPreAgility').combobox({valueField:'value',panelHeight:'auto'}); $('#jornadas-MangasGrado1').combobox({ panelHeight:'auto', valueField: 'value', @@ -269,7 +269,7 @@ $config =Config::getInstance(); ] }); - $('#jornadas-MangasEquipos').combobox({panelHeight:'auto'}); + $('#jornadas-MangasEquipos').combobox({valueField:'value',panelHeight:'auto'}); $('#jornadas-Observaciones').textbox(); $('#jornadas-SlaveOf_List').combobox({ diff --git a/agility/console/dialogs/dlg_perros.inc b/agility/console/dialogs/dlg_perros.inc index 8dfe3fb18..9805f2662 100644 --- a/agility/console/dialogs/dlg_perros.inc +++ b/agility/console/dialogs/dlg_perros.inc @@ -105,6 +105,7 @@ $config =Config::getInstance(); pg.combogrid('clear'); pg.combogrid('setValue',data.Guia); pg.combogrid('setText',data.NombreGuia); + $('#perros-Genero').combobox('setValue',data.Genero); } }); // - botones @@ -138,7 +139,7 @@ $config =Config::getInstance(); $('#perros-Raza').textbox(); $('#perros-LOE_RRC').textbox(); $('#perros-Licencia').textbox(); - $('#perros-Genero').combobox({panelHeight:'auto'}); + $('#perros-Genero').combobox({valueField:'value',panelHeight:'auto'}); $('#perros-Grados_Perro').combobox({ panelHeight: 'auto', diff --git a/agility/console/dialogs/dlg_usuarios.inc b/agility/console/dialogs/dlg_usuarios.inc index be00fdc9f..79005262b 100644 --- a/agility/console/dialogs/dlg_usuarios.inc +++ b/agility/console/dialogs/dlg_usuarios.inc @@ -125,7 +125,7 @@ $config =Config::getInstance(); }); $('#usuarios-Gecos').textbox(); $('#usuarios-Phone').textbox(); - $('#usuarios-Perms').combobox({panelHeight:'auto'}); + $('#usuarios-Perms').combobox({valueField:'value',panelHeight:'auto'}); $('#usuarios-Club').combogrid({ panelWidth: 350, diff --git a/agility/console/dialogs/infomanga.php b/agility/console/dialogs/infomanga.php index 2dc9b8b18..369ea71e1 100644 --- a/agility/console/dialogs/infomanga.php +++ b/agility/console/dialogs/infomanga.php @@ -348,28 +348,28 @@ $('#dmanga_ObstM').textbox({onChange:function(n,o){dmanga_setRecorridos();}}); $('#dmanga_ObstS').textbox({onChange:function(n,o){dmanga_setRecorridos();}}); $('#dmanga_ObstT').textbox({onChange:function(n,o){dmanga_setRecorridos();}}); - $('#dmanga_TRS_L_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_L_Unit')}}); - $('#dmanga_TRS_M_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_M_Unit')}}); - $('#dmanga_TRS_S_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_S_Unit')}}); - $('#dmanga_TRS_T_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_T_Unit')}}); + $('#dmanga_TRS_L_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_L_Unit')}}); + $('#dmanga_TRS_M_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_M_Unit')}}); + $('#dmanga_TRS_S_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_S_Unit')}}); + $('#dmanga_TRS_T_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_T_Unit')}}); $('#dmanga_TRS_L_Factor').textbox(); $('#dmanga_TRS_M_Factor').textbox(); $('#dmanga_TRS_S_Factor').textbox(); $('#dmanga_TRS_T_Factor').textbox(); - $('#dmanga_TRS_L_Unit').combobox({panelHeight:'auto'}); - $('#dmanga_TRS_M_Unit').combobox({panelHeight:'auto'}); - $('#dmanga_TRS_S_Unit').combobox({panelHeight:'auto'}); - $('#dmanga_TRS_T_Unit').combobox({panelHeight:'auto'}); + $('#dmanga_TRS_L_Unit').combobox({valueField:'value',panelHeight:'auto'}); + $('#dmanga_TRS_M_Unit').combobox({valueField:'value',panelHeight:'auto'}); + $('#dmanga_TRS_S_Unit').combobox({valueField:'value',panelHeight:'auto'}); + $('#dmanga_TRS_T_Unit').combobox({valueField:'value',panelHeight:'auto'}); $('#dmanga_TRS_L_TimeSpeed').textbox(); $('#dmanga_TRS_M_TimeSpeed').textbox(); $('#dmanga_TRS_S_TimeSpeed').textbox(); $('#dmanga_TRS_T_TimeSpeed').textbox(); - $('#dmanga_TRM_L_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_L_Unit')}}); - $('#dmanga_TRM_M_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_M_Unit')}}); - $('#dmanga_TRM_S_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_S_Unit')}}); - $('#dmanga_TRM_T_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_T_Unit')}}); + $('#dmanga_TRM_L_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_L_Unit')}}); + $('#dmanga_TRM_M_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_M_Unit')}}); + $('#dmanga_TRM_S_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_S_Unit')}}); + $('#dmanga_TRM_T_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_T_Unit')}}); $('#dmanga_TRM_L_Factor').textbox(); $('#dmanga_TRM_M_Factor').textbox(); $('#dmanga_TRM_S_Factor').textbox(); $('#dmanga_TRM_T_Factor').textbox(); - $('#dmanga_TRM_L_Unit').combobox({panelHeight:'auto'}); - $('#dmanga_TRM_M_Unit').combobox({panelHeight:'auto'}); - $('#dmanga_TRM_S_Unit').combobox({panelHeight:'auto'}); - $('#dmanga_TRM_T_Unit').combobox({panelHeight:'auto'}); + $('#dmanga_TRM_L_Unit').combobox({valueField:'value',panelHeight:'auto'}); + $('#dmanga_TRM_M_Unit').combobox({valueField:'value',panelHeight:'auto'}); + $('#dmanga_TRM_S_Unit').combobox({valueField:'value',panelHeight:'auto'}); + $('#dmanga_TRM_T_Unit').combobox({valueField:'value',panelHeight:'auto'}); $('#dmanga_Observaciones').textbox(); $('#dmanga_Juez1').combogrid({ diff --git a/agility/index.php b/agility/index.php index 2bc6f4d89..4b636192a 100644 --- a/agility/index.php +++ b/agility/index.php @@ -163,7 +163,7 @@ function myRowStyler2(idx,row) { return pbRowStyler2(idx,row); }