fix collect table

develop
Спиридонов Денис 12 years ago
parent 0a297cd961
commit dd92249b85

@ -319,6 +319,7 @@ def collect_table(field, val_list, client, wait_thread):
choice_value = ChoiceValue[j] choice_value = ChoiceValue[j]
typefield = choice_value.typefield typefield = choice_value.typefield
# if readonly, except first column # if readonly, except first column
if typefield == 'readonly' and j > 0: if typefield == 'readonly' and j > 0:
continue continue
elif typefield in ['check', 'check_tristate']: elif typefield in ['check', 'check_tristate']:
@ -331,9 +332,8 @@ def collect_table(field, val_list, client, wait_thread):
temp_row.append('off') temp_row.append('off')
else: else:
temp_row.append(val_table[i][j]) temp_row.append(val_table[i][j])
elif typefield in ['input', 'combo', 'comboEdit', 'openfile', \ elif typefield in ['input', 'combo', 'comboEdit', 'openfile', \
'file', 'radio']: 'file', 'radio', 'text']:
if len (val_table[i]) < j + 1: if len (val_table[i]) < j + 1:
temp_row.append('') temp_row.append('')
else: else:
@ -404,7 +404,7 @@ def collect_obj_body(body, field):
temp_row.append(body[i][j]) temp_row.append(body[i][j])
elif typefield in ['input', 'combo', 'comboEdit', 'openfile', \ elif typefield in ['input', 'combo', 'comboEdit', 'openfile', \
'file', 'password', 'radio']: 'file', 'password', 'radio', 'text']:
if len (body[i]) < j + 1: if len (body[i]) < j + 1:
temp_row.append('') temp_row.append('')
elif not body[i][j]: elif not body[i][j]:

Loading…
Cancel
Save