summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-10-29 23:14:22 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-10-29 23:14:22 +0100
commit4d8821fff11d8c1b148dc88b097c099e30481182 (patch)
tree7702a5f61b7295f20c8690ed51bb0bc9b63d2e9f /ishtar_common
parentba62cf00309715a9ed68c934c3b4c7c62dd1b6df (diff)
downloadIshtar-4d8821fff11d8c1b148dc88b097c099e30481182.tar.bz2
Ishtar-4d8821fff11d8c1b148dc88b097c099e30481182.zip
Add update_data util to overload data dict properly
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/utils.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index e60fc0913..fb09c5876 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -145,6 +145,24 @@ def check_model_access_control(request, model, available_perms=None):
return allowed, own
+def update_data(data_1, data_2):
+ """
+ Update a data directory taking account of key detail
+ """
+ res = {}
+ if not isinstance(data_1, dict) or not isinstance(data_2, dict):
+ return data_1
+ for k in data_1:
+ if k not in data_2:
+ res[k] = data_1[k]
+ else:
+ res[k] = update_data(data_1[k], data_2[k])
+ for k in data_2:
+ if k not in data_1:
+ res[k] = data_2[k]
+ return res
+
+
class MultiValueDict(BaseMultiValueDict):
def get(self, *args, **kwargs):
v = super(MultiValueDict, self).getlist(*args, **kwargs)