vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: merge cards function

Browse source
This commit is contained in:
Shivam Mishra 2020-12-02 11:24:41 +05:30
parent d83ee38d2c
commit 4489ef92ec
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frappe/desk/desktop.py
View file

@ -606,11 +606,12 @@ def merge_cards_based_on_label(cards):
"""Merge cards with common label."""
cards_dict = {}
for card in cards:
if card.label in cards_dict:
links = loads(cards_dict[card.label].links) + loads(card.links)
cards_dict[card.label].update(dict(links=dumps(links)))
cards_dict[card.label] = cards_dict.pop(card.label)
label = card.get('label')
if label in cards_dict:
links = loads(cards_dict[label].links) + loads(card.links)
cards_dict[label].update(dict(links=dumps(links)))
cards_dict[label] = cards_dict.pop(label)
else:
cards_dict[card.label] = card
cards_dict[label] = card
return list(cards_dict.values())