diff options
author | Dave Lerner <dave.lerner@windriver.com> | 2016-04-08 09:39:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-09 23:00:46 +0100 |
commit | 52cfdb6a88060605f3a0d21e0227477db1049f12 (patch) | |
tree | b20481334b12c9b7b68fa9013f3910203777ef64 /bitbake/lib/toaster/toastergui/static | |
parent | dae4ffb55387edc55fd102c5b6013ab1ebb44a8d (diff) | |
download | poky-52cfdb6a88060605f3a0d21e0227477db1049f12.tar.gz |
bitbake: toaster: fixes for customimage package not found
For a custom image, if a search for a package results in no packages
found, then additional information should be presented to the user.
This is different than a 'no results' found for a search in other
contexts, for example, a search for a package in a non-customised build.
For a custom image, a package search failure can happen because the
package was not added to the custom image. This commit presents more
information to the user, suggesting why the package was not found in the
custom image.
The generic table view handling js changes to handle a new div
element no-results-special-... such that, if present, that template
section is shown rather than the default no-results-... section.
[YOCTO #9154]
(Bitbake rev: 66b7c7ef61058b52031d71b10effcfe69afbd57b)
Signed-off-by: Dave Lerner <dave.lerner@windriver.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/static')
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/customrecipe.js | 9 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/table.js | 11 |
2 files changed, 18 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/customrecipe.js b/bitbake/lib/toaster/toastergui/static/js/customrecipe.js index a31c26834e..1c0ef9e37d 100644 --- a/bitbake/lib/toaster/toastergui/static/js/customrecipe.js +++ b/bitbake/lib/toaster/toastergui/static/js/customrecipe.js | |||
@@ -265,6 +265,15 @@ function customRecipePageInit(ctx) { | |||
265 | }); | 265 | }); |
266 | } | 266 | } |
267 | 267 | ||
268 | $("#no-results-show-all-packages").click(function(){ | ||
269 | $(".no-results-search-input").val(""); | ||
270 | }); | ||
271 | |||
272 | $("#no-results-remove-search-btn").click(function(){ | ||
273 | $(".no-results-search-input").val(""); | ||
274 | $(this).hide(); | ||
275 | }); | ||
276 | |||
268 | /* Trigger a build of your custom image */ | 277 | /* Trigger a build of your custom image */ |
269 | $(".build-custom-image").click(function(){ | 278 | $(".build-custom-image").click(function(){ |
270 | libtoaster.startABuild(null, ctx.recipe.name, | 279 | libtoaster.startABuild(null, ctx.recipe.name, |
diff --git a/bitbake/lib/toaster/toastergui/static/js/table.js b/bitbake/lib/toaster/toastergui/static/js/table.js index a7e4fbad09..2ae7695071 100644 --- a/bitbake/lib/toaster/toastergui/static/js/table.js +++ b/bitbake/lib/toaster/toastergui/static/js/table.js | |||
@@ -75,8 +75,15 @@ function tableInit(ctx){ | |||
75 | 75 | ||
76 | if (tableData.total === 0){ | 76 | if (tableData.total === 0){ |
77 | tableContainer.hide(); | 77 | tableContainer.hide(); |
78 | $("#new-search-input-"+ctx.tableName).val(tableParams.search); | 78 | if ($("#no-results-special-"+ctx.tableName).length > 0) { |
79 | $("#no-results-"+ctx.tableName).show(); | 79 | /* use this page's special no-results form instead of the default */ |
80 | $("#no-results-search-input-"+ctx.tableName).val(tableParams.search); | ||
81 | $("#no-results-special-"+ctx.tableName).show(); | ||
82 | $("#results-found-"+ctx.tableName).hide(); | ||
83 | } else { | ||
84 | $("#new-search-input-"+ctx.tableName).val(tableParams.search); | ||
85 | $("#no-results-"+ctx.tableName).show(); | ||
86 | } | ||
80 | table.trigger("table-done", [tableData.total, tableParams]); | 87 | table.trigger("table-done", [tableData.total, tableParams]); |
81 | 88 | ||
82 | return; | 89 | return; |