From b145be8f4f001eb360b667fd16714c9001d8e3d3 Mon Sep 17 00:00:00 2001
From: Denis K <f1nal@cgaming.org>
Date: Sat, 29 Apr 2017 18:32:12 +0300
Subject: [PATCH] Fix tests

---
 jet/dashboard/dashboard.py | 14 ++++----------
 jet/utils.py               | 11 +++++++++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/jet/dashboard/dashboard.py b/jet/dashboard/dashboard.py
index 5f327a11..e7da843a 100644
--- a/jet/dashboard/dashboard.py
+++ b/jet/dashboard/dashboard.py
@@ -1,4 +1,3 @@
-from django.template import Context
 from importlib import import_module
 from django.core.urlresolvers import reverse
 from django.template.loader import render_to_string
@@ -6,7 +5,8 @@
 from jet.dashboard.models import UserDashboardModule
 from django.utils.translation import ugettext_lazy as _
 from jet.ordered_set import OrderedSet
-from jet.utils import get_admin_site_name
+from jet.utils import get_admin_site_name, context_to_dict
+
 try:
     from django.template.context_processors import csrf
 except ImportError:
@@ -48,12 +48,6 @@ def __init__(self, context, **kwargs):
         self.set_context(context)
 
     def set_context(self, context):
-        if isinstance(context, Context):
-            flat = {}
-            for d in context.dicts:
-                flat.update(d)
-            context = flat
-
         self.context = context
         self.init_with_context(context)
         self.load_modules()
@@ -153,7 +147,7 @@ def load_modules(self):
         self.modules = loaded_modules
 
     def render(self):
-        context = self.context
+        context = context_to_dict(self.context)
         context.update({
             'columns': range(self.columns),
             'modules': self.modules,
@@ -164,7 +158,7 @@ def render(self):
         return render_to_string('jet.dashboard/dashboard.html', context)
 
     def render_tools(self):
-        context = self.context
+        context = context_to_dict(self.context)
         context.update({
             'children': self.children,
             'app_label': self.app_label,
diff --git a/jet/utils.py b/jet/utils.py
index 294db842..a8fa068b 100644
--- a/jet/utils.py
+++ b/jet/utils.py
@@ -1,5 +1,6 @@
 import datetime
 import json
+from django.template import Context
 from django.utils import translation
 from jet import settings
 from jet.models import PinnedApplication
@@ -426,3 +427,13 @@ def get_menu_item_app(data):
                 app['current'] = False
 
     return app_list
+
+
+def context_to_dict(context):
+    if isinstance(context, Context):
+        flat = {}
+        for d in context.dicts:
+            flat.update(d)
+        context = flat
+
+    return context