From 9d8e36a6c9663a1665ecefca59d172ad53f90ffe Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Fri, 13 Nov 2015 15:28:07 +0000 Subject: 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 Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/templates/base.html | 133 +++++---------------- 1 file changed, 33 insertions(+), 100 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 11ac2a0355..e0b15cef12 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html @@ -3,15 +3,15 @@ {% load projecttags %} {% load project_url_tag %} - - - {% block title %} Toaster {% endblock %} - - - - - - + + + {% block title %} Toaster {% endblock %} + + + + + + @@ -40,7 +40,6 @@ projectId : {{project.id}}, projectPageUrl : {% url 'project' project.id as purl %}{{purl|json}}, projectName : {{project.name|json}}, - projectIsDefault: {% if project.is_default %}true{% else %}false{% endif %}, recipesTypeAheadUrl: {% url 'xhr_recipestypeahead' project.id as paturl%}{{paturl|json}}, layersTypeAheadUrl: {% url 'xhr_layerstypeahead' project.id as paturl%}{{paturl|json}}, machinesTypeAheadUrl: {% url 'xhr_machinestypeahead' project.id as paturl%}{{paturl|json}}, @@ -51,37 +50,24 @@ projectId : undefined, projectPageUrl : undefined, projectName : undefined, - projectIsDefault: false, {% endif %} }; - - + {% block extraheadcontent %} + {% endblock %} + -{% block extraheadcontent %} -{% endblock %} - + - - - {% csrf_token %} - + {% csrf_token %} + - +
@@ -125,72 +111,19 @@ {% if BUILD_MODE %} -
- New project -
- {% endif %} - - - {% if BUILD_MODE and non_cli_projects.count > 0 %} - +
+ New project +
{% endif %} +
+
- - -
-
-{% block pagecontent %} -{% endblock %} -
-
- +
+
+ {% block pagecontent %} + {% endblock %} +
+
+ - -- cgit v1.2.3-54-g00ecf