Fix in selectmodelform for show all fathers items
This commit is contained in:
parent
c0d40b0b1e
commit
373c58ade7
1 changed files with 16 additions and 15 deletions
|
|
@ -112,8 +112,7 @@ class SelectModelForm(SelectForm):
|
||||||
|
|
||||||
self.arr_select['']=''
|
self.arr_select['']=''
|
||||||
|
|
||||||
cur=self.model.select([self.field_name, self.field_value], True)
|
with self.model.select([self.field_name, self.field_value], True) as cur:
|
||||||
|
|
||||||
for arr_value in cur:
|
for arr_value in cur:
|
||||||
|
|
||||||
self.arr_select[arr_value[self.field_value]]=arr_value[self.field_name]
|
self.arr_select[arr_value[self.field_value]]=arr_value[self.field_name]
|
||||||
|
|
@ -145,8 +144,8 @@ class SelectModelForm(SelectForm):
|
||||||
|
|
||||||
for arr_value in cur:
|
for arr_value in cur:
|
||||||
|
|
||||||
#self.arr_select[arr_value[self.field_value]]=arr_value[self.field_name]
|
if not arr_value[self.field_parent] in arr_son:
|
||||||
if not self.field_parent in arr_son:
|
|
||||||
arr_son[arr_value[self.field_parent]]=[]
|
arr_son[arr_value[self.field_parent]]=[]
|
||||||
|
|
||||||
arr_son[arr_value[self.field_parent]].append([arr_value[self.field_value], arr_value[self.field_name]])
|
arr_son[arr_value[self.field_parent]].append([arr_value[self.field_value], arr_value[self.field_name]])
|
||||||
|
|
@ -172,6 +171,8 @@ class SelectModelForm(SelectForm):
|
||||||
for son in arr_son[parent_id]:
|
for son in arr_son[parent_id]:
|
||||||
self.arr_select[son[0]]=separator+son[1]
|
self.arr_select[son[0]]=separator+son[1]
|
||||||
|
|
||||||
|
son_separator=separator
|
||||||
|
|
||||||
if son[0] in arr_son:
|
if son[0] in arr_son:
|
||||||
separator+='--'
|
son_separator+='--'
|
||||||
self.create_son(son[0],arr_son, separator)
|
self.create_son(son[0],arr_son, son_separator)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue