From 4489ef92ec6767b245deceac8d48e45266ae42d7 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 2 Dec 2020 11:24:41 +0530 Subject: [PATCH] fix: merge cards function --- frappe/desk/desktop.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index d8794ed534..01b5c5c892 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -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())