From a49cd7be41516d40f7529464030aff6a82fb1b6d Mon Sep 17 00:00:00 2001
From: Dichi13 <diciganteng01@icloud.com>
Date: Sun, 28 Apr 2019 13:56:41 +0700
Subject: [PATCH] added admin to subdata
---
modules/page.py | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/modules/page.py b/modules/page.py
index f9323c5..dbafce7 100644
--- a/modules/page.py
+++ b/modules/page.py
@@ -31,20 +31,33 @@ def get_page():
try:
vdata = db.VizData.objects.with_id(data_id)
if vdata is not None:
+ subdata = [child for child in vdata.subdata]
+
resp = {
"status":200,
"data":vdata,
- "subdata":[child for child in vdata.subdata]
+ "subdata":subdata
}
+
if return_admin:
admins = db.User.objects(page_list__in = [vdata.id])
if len(admins) > 0:
admin = admins[0]
del admin.password
del admin.page_list
- resp["admin"] = admin
+ vdata["admin"] = admin
else:
- resp["admin"] = None
+ vdata["admin"] = None
+
+ for x in subdata:
+ admins = db.User.objects(page_list__in = [x.id])
+ if len(admins) > 0:
+ admin = admins[0]
+ del admin.password
+ del admin.page_list
+ x["admin"] = admin
+ else:
+ x["admin"] = None
return jsonify(resp)
else:
--
GitLab