diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-02-04 17:38:17 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-17 15:38:52 +0000 |
commit | 97c81e089ffec1fe11d1d0fa48fabd2e6d418eb9 (patch) | |
tree | d2993f6a688c8d0a6cdaa8f0f8e6f361b98dff98 | |
parent | 4157c3849f1f8083b11ec3658b4f74b3e68dea2d (diff) | |
download | poky-97c81e089ffec1fe11d1d0fa48fabd2e6d418eb9.tar.gz |
bitbake: toaster: fix javascript for table filters
This patch adds javascript link for resetting page filters
in the tool tip "Show all" button.
Also fixes a JS bug for when the cookie is not set yet.
(Bitbake rev: e123922274ea875105e6ed855b3368b8b77fca64)
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/basetable_bottom.html | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/basetable_top.html | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html index abce7c24b7..4eb303da79 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html | |||
@@ -40,6 +40,7 @@ | |||
40 | 40 | ||
41 | // we load cookies for the column display | 41 | // we load cookies for the column display |
42 | save = $.cookie('_displaycols_{{objectname}}'); | 42 | save = $.cookie('_displaycols_{{objectname}}'); |
43 | if (save != undefined) { | ||
43 | setting = save.split(';'); | 44 | setting = save.split(';'); |
44 | for ( i = 0; i < setting.length; i++) { | 45 | for ( i = 0; i < setting.length; i++) { |
45 | if (setting[i].length > 0) { | 46 | if (setting[i].length > 0) { |
@@ -52,6 +53,7 @@ | |||
52 | } | 53 | } |
53 | } | 54 | } |
54 | } | 55 | } |
56 | } | ||
55 | 57 | ||
56 | $('.chbxtoggle').each(function () { | 58 | $('.chbxtoggle').each(function () { |
57 | showhideTableColumn($(this).attr('id'), $(this).is(':checked')) | 59 | showhideTableColumn($(this).attr('id'), $(this).is(':checked')) |
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index 84c73a72e0..9a8bacb384 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html | |||
@@ -79,7 +79,7 @@ | |||
79 | {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'orderby' : '{{tc.orderfield}}' })" >{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%} | 79 | {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'orderby' : '{{tc.orderfield}}' })" >{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%} |
80 | {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} | 80 | {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} |
81 | {%if tc.filter%}<div class="btn-group pull-right"> | 81 | {%if tc.filter%}<div class="btn-group pull-right"> |
82 | <a href="#filter_{{tc.filter.class}}" role="button" class="btn btn-mini {%if request.GET.filter%}{{tc.filter.options|filtered_icon:request.GET.filter}} {%endif%}" {%if request.GET.filter%} title="<p>{{tc.filter.options|filtered_tooltip:request.GET.filter}}</p><p><a class='btn btn-small btn-primary' href=''>Show all {{objectname}}</a></p>" {%endif%} data-toggle="modal"> <i class="icon-filter filtered"></i> </a> | 82 | <a href="#filter_{{tc.filter.class}}" role="button" class="btn btn-mini {%if request.GET.filter%}{{tc.filter.options|filtered_icon:request.GET.filter}} {%endif%}" {%if request.GET.filter%} title="<p>{{tc.filter.options|filtered_tooltip:request.GET.filter}}</p><p><a class='btn btn-small btn-primary' href=javascript:reload_params({'filter':''})>Show all {{objectname}}</a></p>" {%endif%} data-toggle="modal"> <i class="icon-filter filtered"></i> </a> |
83 | </div>{%endif%} | 83 | </div>{%endif%} |
84 | </th>{% endfor %} | 84 | </th>{% endfor %} |
85 | </tr> | 85 | </tr> |