2 files changed, 7 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html
index 7fee26eb42..6cdc5e8110 100644
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/bitbake/lib/toaster/toastergui/templates/base.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 {% load static %}
+{% load projecttags %}
 <html lang="en">
    <head>
        <title>{% if objectname %} {{objectname|title}} - {% endif %}Toaster</title>
@@ -33,8 +34,10 @@
    htmlUrl : "{% static 'html/' %}",
    projectsUrl : "{% url 'all-projects' %}",
    {% if project.id %}
-      projectPageUrl : "{% url 'project' project.id %}",
+      projectPageUrl : {% url 'project' project.id as purl%}{{purl|json}},
-      projectName : "{{project.name}}",
+      projectName : {{project.name|json}},
+      projectTargetsUrl: {% url 'projectavailabletargets' project.id as paturl%}{{paturl|json}},
+      projectBuildsUrl: {% url 'projectbuilds' project.id as pburl %}{{pburl|json}},
      projectId : {{project.id}},
    {% else %}
      projectPageUrl : undefined,
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html
index 7225363c01..bca703a162 100644
--- a/bitbake/lib/toaster/toastergui/templates/project.html
+++ b/bitbake/lib/toaster/toastergui/templates/project.html
@@ -452,9 +452,10 @@ angular.element(document).ready(function() {
  scope.urls.xhr_build = "{% url 'projectbuilds' project.id %}";
  scope.urls.xhr_edit = "{% url 'project' project.id %}?format=json";
  scope.urls.layers = "{% url 'projectlayers' project.id %}";
-  scope.urls.targets = "{% url 'projecttargets' project.id %}";
+  scope.urls.targets = "{% url 'projectavailabletargets' project.id %}";
  scope.urls.machines = "{% url 'projectmachines' project.id %}";
  scope.urls.importlayer = "{% url 'importlayer' project.id %}";
+  scope.urls.xhr_datatypeahead = {% url 'xhr_datatypeahead' project.id as xhrdta %}{{xhrdta|json}};
  scope.project = {{prj|json}};
  scope.builds = {{builds|json}};
  scope.layers = {{layers|json}};