diff --git a/modules/page.py b/modules/page.py index f9323c55ac3f267734dd102239932d85e896f5e3..dbafce72816a88deb5a94f000e1584ffccbe6629 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: