From ed26a06a07a75c8039f2a9b251b350331c7474aa Mon Sep 17 00:00:00 2001
From: Michael Wood <michael.g.wood@intel.com>
Date: Fri, 10 Apr 2015 18:15:03 +0100
Subject: bitbake: toaster: Move project context variables to common scope

We have a bunch of context data which are used in multiple pages so it
makes more sense to have this in a single place libtoaster.ctx that's
accessible from each page rather than request it from every page.

(Bitbake rev: 4ef2774a2f683929c700550a9acc7b8f6074195b)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/lib/toaster/toastergui/templates/base.html | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'bitbake/lib/toaster/toastergui/templates/base.html')

diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html
index 58392b36f5..25933a1e90 100644
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/bitbake/lib/toaster/toastergui/templates/base.html
@@ -26,20 +26,27 @@
   libtoaster.debug = true;
  </script>
 {% endif %}
+<script>
+  libtoaster.ctx = {
+    projectId : {{project.id|default:'undefined'}},
+    xhrDataTypeaheadUrl : "{% url 'xhr_datatypeahead' %}",
+    {% if project.id %}
+    xhrProjectEditUrl : "{% url 'xhr_projectedit' project.id %}",
+    projectPageUrl : "{% url 'project' project.id %}",
+    projectName : "{{project.name}}",
+    {% endif %}
+  };
+</script>
 <script src="{% static 'js/base.js' %}"></script>
 {%if MANAGED %}
 <script>
   $(document).ready(function () {
     /* Vars needed for base.js */
     var ctx = {};
-    ctx.xhrDataTypeaheadUrl = "{% url 'xhr_datatypeahead' %}";
     ctx.projectBuildUrl = "{% url 'xhr_build' %}";
-    ctx.projectPageUrl = "{% url 'base_project' %}";
+    ctx.projectBasePageUrl = "{% url 'base_project' %}";
     ctx.projectInfoUrl = "{% url 'xhr_projectinfo' %}";
     ctx.numProjects = {{projects|length}};
-    {% if project %}
-      ctx.projectId = {{project.id}};
-    {% endif %}
     ctx.currentUrl = "{{request.path|escapejs}}";
 
     basePageInit(ctx);
-- 
cgit v1.2.3-54-g00ecf