Skip to content
Snippets Groups Projects

Migrate from jinja2 to just plain python dictionaries

Merged Pelle Koster requested to merge no-jinja into develop
16 files
+ 1588
2312
Compare changes
  • Side-by-side
  • Inline
Files
16
@@ -2,17 +2,16 @@
@@ -2,17 +2,16 @@
Grafana Organization management helpers.
Grafana Organization management helpers.
"""
"""
 
 
import logging
import random
import random
import string
import string
import logging
import jinja2
import json
import os
from typing import Dict, List, Union
from datetime import datetime
from datetime import datetime
from brian_dashboard_manager.grafana.utils.request import AdminRequest, \
from typing import Dict, List, Union
TokenRequest
from brian_dashboard_manager.grafana.dashboard import create_dashboard
from brian_dashboard_manager.grafana.dashboard import create_dashboard
 
from brian_dashboard_manager.grafana.utils.request import AdminRequest, TokenRequest
 
from brian_dashboard_manager.templating.homedashboard import render_homedashboard
logger = logging.getLogger(__name__)
logger = logging.getLogger(__name__)
@@ -146,19 +145,8 @@ def set_home_dashboard(request: TokenRequest, is_staff):
@@ -146,19 +145,8 @@ def set_home_dashboard(request: TokenRequest, is_staff):
:param is_staff: True if the organization is the staff organization
:param is_staff: True if the organization is the staff organization
:return: True if successful
:return: True if successful
"""
"""
payload = render_homedashboard(staff=is_staff)
file = os.path.abspath(os.path.join(
dashboard = create_dashboard(request, payload)
os.path.dirname(__file__),
'..',
'templating',
'templates',
'homedashboard.json.j2'))
with open(file) as f:
template = jinja2.Template(f.read())
rendered = template.render({'staff': is_staff})
rendered = json.loads(rendered)
dashboard = create_dashboard(request, rendered)
r = request.put('api/org/preferences', json={
r = request.put('api/org/preferences', json={
'homeDashboardId': dashboard.get('id')
'homeDashboardId': dashboard.get('id')
}).json()
}).json()
Loading