summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-06-11 13:14:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-26 09:27:31 +0100
commitb98a2fcab600d74a01b76fe3f9e5249642f2c32b (patch)
tree7a1c4c87872c16ea6c56e73d9d43f921b0e3cfb9
parent933e4dbb5048ea84c32f2313e6c8e5ca7895fe48 (diff)
downloadpoky-b98a2fcab600d74a01b76fe3f9e5249642f2c32b.tar.gz
bitbake: toaster: fixing undefined variables
This patchset fixes usage of undefined variables in the base page. (Bitbake rev: a9e889af41e1e59c3b426c78ba80e4d49c6c122b) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/toastergui/templates/base.html11
-rw-r--r--bitbake/lib/toaster/toastergui/templates/basetable_top.html11
-rw-r--r--bitbake/lib/toaster/toastergui/templates/filtersnippet.html2
3 files changed, 16 insertions, 8 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html
index 9f19c0384c..3f3253d6b2 100644
--- a/bitbake/lib/toaster/toastergui/templates/base.html
+++ b/bitbake/lib/toaster/toastergui/templates/base.html
@@ -29,17 +29,18 @@
29{% endif %} 29{% endif %}
30<script> 30<script>
31 libtoaster.ctx = { 31 libtoaster.ctx = {
32 projectId : {{project.id|default:'undefined'}},
33 jsUrl : "{% static 'js/' %}", 32 jsUrl : "{% static 'js/' %}",
34 htmlUrl : "{% static 'html/' %}", 33 htmlUrl : "{% static 'html/' %}",
35 projectsUrl : "{% url 'all-projects' %}", 34 projectsUrl : "{% url 'all-projects' %}",
36 {% if project.id %} 35 {% if project.id %}
36 projectId : {{project.id}},
37 projectPageUrl : {% url 'project' project.id as purl%}{{purl|json}}, 37 projectPageUrl : {% url 'project' project.id as purl%}{{purl|json}},
38 projectName : {{project.name|json}}, 38 projectName : {{project.name|json}},
39 projectTargetsUrl: {% url 'projectavailabletargets' project.id as paturl%}{{paturl|json}}, 39 projectTargetsUrl: {% url 'projectavailabletargets' project.id as paturl%}{{paturl|json}},
40 projectBuildsUrl: {% url 'projectbuilds' project.id as pburl %}{{pburl|json}}, 40 projectBuildsUrl: {% url 'projectbuilds' project.id as pburl %}{{pburl|json}},
41 projectId : {{project.id}}, 41 projectId : {{project.id}},
42 {% else %} 42 {% else %}
43 projectId : undefined,
43 projectPageUrl : undefined, 44 projectPageUrl : undefined,
44 projectName : undefined, 45 projectName : undefined,
45 projectId : undefined, 46 projectId : undefined,
@@ -101,8 +102,10 @@
101 <h3>New build</h3> 102 <h3>New build</h3>
102 <h6>Project:</h6> 103 <h6>Project:</h6>
103 <span id="project"> 104 <span id="project">
104 <a class="lead" href="{% if project.id %}{% url 'project' project.id %}{% endif %}">{{project.name}}</a> 105 {% if project.id %}
105 <i class="icon-pencil"></i> 106 <a class="lead" href="{% url 'project' project.id %}">{{project.name}}</a>
107 <i class="icon-pencil"></i>
108 {% endif %}
106 </span> 109 </span>
107 <form id="change-project-form" style="display:none;"> 110 <form id="change-project-form" style="display:none;">
108 <div class="input-append"> 111 <div class="input-append">
@@ -122,7 +125,7 @@
122 <form> 125 <form>
123 <input type="text" class="input-xlarge" id="build-target-input" placeholder="Type a recipe name" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead" disabled/> 126 <input type="text" class="input-xlarge" id="build-target-input" placeholder="Type a recipe name" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead" disabled/>
124 <div> 127 <div>
125 <button class="btn btn-primary" id="build-button" data-project-id="{{project.id}}" disabled>Build</button> 128 <button class="btn btn-primary" id="build-button" disabled>Build</button>
126 </div> 129 </div>
127 </form> 130 </form>
128 </li> 131 </li>
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html
index fcd2f036ec..8dd56ed224 100644
--- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html
+++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html
@@ -162,7 +162,7 @@
162<div class="navbar"> 162<div class="navbar">
163 <div class="navbar-inner"> 163 <div class="navbar-inner">
164 <form class="navbar-search input-append pull-left" id="searchform"> 164 <form class="navbar-search input-append pull-left" id="searchform">
165 <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search {%if object_search_display %}{{object_search_display}}{%else%}{{objectname}}{%endif%}" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on btn" tabindex="-1"><i class="icon-remove"></i></a>{%endif%} 165 <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search {%if object_search_display %}{{object_search_display}}{%else%}{{objectname}}{%endif%}" value="{%if request.GET.search %}{{request.GET.search}}{% endif %}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on btn" tabindex="-1"><i class="icon-remove"></i></a>{%endif%}
166 <input type="hidden" name="orderby" value="{{request.GET.orderby}}"> 166 <input type="hidden" name="orderby" value="{{request.GET.orderby}}">
167 <input type="hidden" name="page" value="1"> 167 <input type="hidden" name="page" value="1">
168 <button class="btn" type="submit" value="Search">Search</button> 168 <button class="btn" type="submit" value="Search">Search</button>
@@ -191,7 +191,12 @@
191 onclick="showhideTableColumn( 191 onclick="showhideTableColumn(
192 $(this).attr('id'), 192 $(this).attr('id'),
193 $(this).is(':checked'), 193 $(this).is(':checked'),
194 '{{i.orderkey}}' )" 194 {% if i.ordericon %}
195 '{{i.orderkey}}'
196 {% else %}
197 undefined
198 {% endif %}
199 )"
195 {%else%} 200 {%else%}
196 checked disabled 201 checked disabled
197 {% endif %}/> {{i.name}} 202 {% endif %}/> {{i.name}}
@@ -221,7 +226,7 @@
221 <thead> 226 <thead>
222 <!-- Table header row; generated from "tablecols" entry in the context dict --> 227 <!-- Table header row; generated from "tablecols" entry in the context dict -->
223 <tr> 228 <tr>
224 {% for tc in tablecols %}<th class="{{tc.dclass}} {{tc.clclass}}"> 229 {% for tc in tablecols %}<th class="{%if tc.dclass%}{{tc.dclass}}{%endif%} {% if tc.clclass %}{{tc.clclass}}{% endif %}">
225 {%if tc.qhelp%}<i class="icon-question-sign get-help" title="{{tc.qhelp}}"></i>{%endif%} 230 {%if tc.qhelp%}<i class="icon-question-sign get-help" title="{{tc.qhelp}}"></i>{%endif%}
226 {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'page': 1, 'orderby' : '{{tc.orderfield}}' })">{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%} 231 {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'page': 1, 'orderby' : '{{tc.orderfield}}' })">{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%}
227 {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} 232 {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%}
diff --git a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
index f624d88bad..56e2b21cc0 100644
--- a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
+++ b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
@@ -2,7 +2,7 @@
2<!-- '{{f.class}}' filter --> 2<!-- '{{f.class}}' filter -->
3{% with f.class as key %} 3{% with f.class as key %}
4<form id="filter_{{f.class}}" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true"> 4<form id="filter_{{f.class}}" class="modal hide fade" tabindex="-1" role="dialog" aria-hidden="true">
5 <input type="hidden" name="search" value="{{request.GET.search}}"/> 5 <input type="hidden" name="search" value="{%if request.GET.search %}{{request.GET.search}}{%endif%}"/>
6 <div class="modal-header"> 6 <div class="modal-header">
7 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> 7 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
8 {% if search_term %} 8 {% if search_term %}