Исправлена передача hidden параметра

master-3.5
parent 8095578d48
commit 69752c590f

@ -338,6 +338,7 @@ class MainFrame(QtGui.QWidget):
if field.name in self.changed_expert_list: if field.name in self.changed_expert_list:
field.default = False field.default = False
if field.guitype == "hidden": if field.guitype == "hidden":
if not field.uncompatible:
self.hidden_fields[field.name] = field.value self.hidden_fields[field.name] = field.value
continue continue
if field.element == 'label': if field.element == 'label':
@ -2345,6 +2346,7 @@ class MainFrame(QtGui.QWidget):
debug(10, "SET offset for info", method_name, debug(10, "SET offset for info", method_name,
offset) offset)
param_object.cl_page_offset = str(offset) param_object.cl_page_offset = str(offset)
for hidden_field in self.hidden_fields: for hidden_field in self.hidden_fields:
paramname = hidden_field paramname = hidden_field
if var_mapper: if var_mapper:
@ -2352,7 +2354,6 @@ class MainFrame(QtGui.QWidget):
debug(10, "SET", self.hidden_fields[hidden_field], debug(10, "SET", self.hidden_fields[hidden_field],
"from hidden field", hidden_field, "for", paramname) "from hidden field", hidden_field, "for", paramname)
param_object[paramname] = self.hidden_fields[hidden_field] param_object[paramname] = self.hidden_fields[hidden_field]
for Group in self.view.groups.GroupField: for Group in self.view.groups.GroupField:
if not Group.fields: if not Group.fields:
continue continue
@ -2370,6 +2371,7 @@ class MainFrame(QtGui.QWidget):
# может быть использовано как значение для переменной # может быть использовано как значение для переменной
# в другом методе, иначе значение пропускаем # в другом методе, иначе значение пропускаем
if field.uncompatible and method_name == self.method_name: if field.uncompatible and method_name == self.method_name:
debug(10, "SKIP uncompatible", field.name)
continue continue
if type(self.view_dict[field.name]) == QGroupBox: if type(self.view_dict[field.name]) == QGroupBox:
@ -2468,6 +2470,7 @@ class MainFrame(QtGui.QWidget):
for fields in self.expert_list: for fields in self.expert_list:
param_object[fields] = None param_object[fields] = None
return wrapper return wrapper
def fix_string_value(self, value): def fix_string_value(self, value):
@ -2585,6 +2588,7 @@ class MainFrame(QtGui.QWidget):
# call method on server # call method on server
try: try:
if param_object: if param_object:
debug(15, "CALL PARAM", param_object)
meth_result_temp = self.ClientObj.client.service[0] \ meth_result_temp = self.ClientObj.client.service[0] \
[method_name](sid, param_object) [method_name](sid, param_object)
else: else:
@ -2839,6 +2843,7 @@ class MainFrame(QtGui.QWidget):
(error.message) (error.message)
self.error_label_dict[error.field].show() self.error_label_dict[error.field].show()
debug(15, "ERROR highlight", error.field)
self.highlight_element_error(error.field) self.highlight_element_error(error.field)
except RuntimeError: except RuntimeError:
pass pass

Loading…
Cancel
Save