diff options
author | Elliot Smith <elliot.smith@intel.com> | 2015-11-13 15:28:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:55:07 +0000 |
commit | 9d8e36a6c9663a1665ecefca59d172ad53f90ffe (patch) | |
tree | 264b8cec39b31534c64634b9a5112a0a6f56b0a4 /bitbake/lib/toaster/toastergui/templates/projecttopbar.html | |
parent | 4677d8b4fb9ab00970ccc6c07d4e75a103dce3f5 (diff) | |
download | poky-9d8e36a6c9663a1665ecefca59d172ad53f90ffe.tar.gz |
bitbake: toaster: localhostbectrl Pass DATABASE_URL in via the process environment
Instead of putting the DATABASE_URL as part of the command for launching
the bitbake observer process set it as part of environment.
This fixes two issues 1. Where the value isn't quoted and therefore will be
interpreted in the shell and 2. Anyone being able to see the value of
DATABASE_URL in the process tree.
[YOCTO #8669]
(Bitbake rev: 832a8523067606b180c02f0d1544e8a23219bb08)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/projecttopbar.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projecttopbar.html | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html index d8f7cbdbe8..8b44acccfd 100644 --- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html +++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html | |||
@@ -1,3 +1,21 @@ | |||
1 | {% load static %} | ||
2 | <script src="{% static 'js/projecttopbar.js' %}"></script> | ||
3 | <script> | ||
4 | $(document).ready(function () { | ||
5 | var ctx = { | ||
6 | numProjectLayers : {{project.get_project_layer_versions.count}}, | ||
7 | machine : "{{project.get_current_machine_name|default_if_none:""}}", | ||
8 | } | ||
9 | |||
10 | try { | ||
11 | projectTopBarInit(ctx); | ||
12 | } catch (e) { | ||
13 | document.write("Sorry, An error has occurred loading this page"); | ||
14 | console.warn(e); | ||
15 | } | ||
16 | }); | ||
17 | </script> | ||
18 | |||
1 | <div class="alert alert-success lead" id="project-created-notification" style="margin-top:15px; display:none"> | 19 | <div class="alert alert-success lead" id="project-created-notification" style="margin-top:15px; display:none"> |
2 | <button type="button" class="close" data-dismiss="alert">×</button> | 20 | <button type="button" class="close" data-dismiss="alert">×</button> |
3 | Your project <strong>{{project.name}}</strong> has been created. You can now <a href="{% url 'projectmachines' project.id %}">select your target machine</a> and <a href="{% url 'projectsoftwarerecipes' project.id %}">choose image recipes</a> to build. | 21 | Your project <strong>{{project.name}}</strong> has been created. You can now <a href="{% url 'projectmachines' project.id %}">select your target machine</a> and <a href="{% url 'projectsoftwarerecipes' project.id %}">choose image recipes</a> to build. |