fix getitem folder with subfolders
This commit is contained in:
parent
fa250e2ae3
commit
118ca1d14e
@ -155,9 +155,14 @@ class configfile:
|
|||||||
folder = self.connections[uniques["folder"]]
|
folder = self.connections[uniques["folder"]]
|
||||||
newfolder = folder.copy()
|
newfolder = folder.copy()
|
||||||
newfolder.pop("type")
|
newfolder.pop("type")
|
||||||
for node in newfolder.keys():
|
for node in folder.keys():
|
||||||
|
if node == "type":
|
||||||
|
continue
|
||||||
if "type" in newfolder[node].keys():
|
if "type" in newfolder[node].keys():
|
||||||
newfolder[node].pop("type")
|
if newfolder[node]["type"] == "subfolder":
|
||||||
|
newfolder.pop(node)
|
||||||
|
else:
|
||||||
|
newfolder[node].pop("type")
|
||||||
if keys == None:
|
if keys == None:
|
||||||
return newfolder
|
return newfolder
|
||||||
else:
|
else:
|
||||||
|
@ -458,9 +458,14 @@ __pdoc__ = {
|
|||||||
folder = self.connections[uniques["folder"]]
|
folder = self.connections[uniques["folder"]]
|
||||||
newfolder = folder.copy()
|
newfolder = folder.copy()
|
||||||
newfolder.pop("type")
|
newfolder.pop("type")
|
||||||
for node in newfolder.keys():
|
for node in folder.keys():
|
||||||
|
if node == "type":
|
||||||
|
continue
|
||||||
if "type" in newfolder[node].keys():
|
if "type" in newfolder[node].keys():
|
||||||
newfolder[node].pop("type")
|
if newfolder[node]["type"] == "subfolder":
|
||||||
|
newfolder.pop(node)
|
||||||
|
else:
|
||||||
|
newfolder[node].pop("type")
|
||||||
if keys == None:
|
if keys == None:
|
||||||
return newfolder
|
return newfolder
|
||||||
else:
|
else:
|
||||||
@ -575,9 +580,14 @@ __pdoc__ = {
|
|||||||
folder = self.connections[uniques["folder"]]
|
folder = self.connections[uniques["folder"]]
|
||||||
newfolder = folder.copy()
|
newfolder = folder.copy()
|
||||||
newfolder.pop("type")
|
newfolder.pop("type")
|
||||||
for node in newfolder.keys():
|
for node in folder.keys():
|
||||||
|
if node == "type":
|
||||||
|
continue
|
||||||
if "type" in newfolder[node].keys():
|
if "type" in newfolder[node].keys():
|
||||||
newfolder[node].pop("type")
|
if newfolder[node]["type"] == "subfolder":
|
||||||
|
newfolder.pop(node)
|
||||||
|
else:
|
||||||
|
newfolder[node].pop("type")
|
||||||
if keys == None:
|
if keys == None:
|
||||||
return newfolder
|
return newfolder
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user