From d2f898a291af05fdffaa81dc461d32af0fee0fd6 Mon Sep 17 00:00:00 2001 From: KRAIEM Taha Yassine Date: Tue, 11 May 2021 14:03:27 +0200 Subject: [PATCH] Changes: - EE: fixed /accounts - merged license status into /accounts --- api/chalicelib/blueprints/bp_core_dynamic.py | 5 +++-- ee/api/chalicelib/blueprints/bp_core_dynamic.py | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/api/chalicelib/blueprints/bp_core_dynamic.py b/api/chalicelib/blueprints/bp_core_dynamic.py index d3f81eaf3..4ec5278d7 100644 --- a/api/chalicelib/blueprints/bp_core_dynamic.py +++ b/api/chalicelib/blueprints/bp_core_dynamic.py @@ -71,11 +71,12 @@ def get_account(context): "limits": { "teamMember": -1, "projects": -1, - "metadata": metadata.get_remaining_metadata_with_count(context['tenantId'])}, + "metadata": metadata.get_remaining_metadata_with_count(context['tenantId']) + }, + **license.get_status(context["tenantId"]) } } - @app.route('/projects', methods=['GET']) def get_projects(context): return {"data": projects.get_projects(tenant_id=context["tenantId"], recording_state=True, gdpr=True, recorded=True, diff --git a/ee/api/chalicelib/blueprints/bp_core_dynamic.py b/ee/api/chalicelib/blueprints/bp_core_dynamic.py index d4f41b7b3..505f10cb9 100644 --- a/ee/api/chalicelib/blueprints/bp_core_dynamic.py +++ b/ee/api/chalicelib/blueprints/bp_core_dynamic.py @@ -70,13 +70,13 @@ def get_account(context): **r, "limits": { "teamMember": -1, - # change this in open-source - "projects": -1, # change this in open-source - "metadata": metadata.get_remaining_metadata_with_count(context['tenantId'])}, + "projects": -1, + "metadata": metadata.get_remaining_metadata_with_count(context['tenantId']) + }, + **license.get_status(context["tenantId"]) } } - @app.route('/projects', methods=['GET']) def get_projects(context): return {"data": projects.get_projects(tenant_id=context["tenantId"], recording_state=True, gdpr=True, recorded=True,