diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-06 08:26:40 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-11 23:48:09 +0300 |
| commit | 5dd7cbb3457c90724fc442b15bab2082d82b560a (patch) | |
| tree | 368ed59906a1874f33a3a4a44fbb2f544013dc0a /poky/bitbake/lib/toaster/toastergui | |
| parent | 3b32a97b1b171ca776a24454d22c1c59fc7bfa00 (diff) | |
| download | openbmc-5dd7cbb3457c90724fc442b15bab2082d82b560a.tar.xz | |
poky: sumo refresh 45ef387cc5..51872d3f99
Update poky to sumo HEAD.
Awais Belal (8):
bitbake: toaster: allow pokydirname to be evaluated when all layers are local
bitbake: toaster: use a more flexible way to find bitbake
bitbake: bitbake: toaster: allow TOASTER_DIR to be overridden from cmdline
bitbake: toaster/widgets.py: avoid divide by zero issues
bitbake: toastergui/newproject.html: fix release divs
bitbake: toaster/checksettings: allow CUSTOM_XML_ONLY setting through env
bitbake: toaster/models.py: allow local paths for custom recipe's base
bitbake: toaster/layerdetails.js: don't hide local layer info
Karsten Strand (1):
bitbake: bitbake: toaster: Fix comparison in recipe template
Change-Id: I8dbcad1d98ff8d3c660563781d887a2c91db5bf2
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/bitbake/lib/toaster/toastergui')
4 files changed, 17 insertions, 11 deletions
diff --git a/poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js index 9ead393cb..933b65b4c 100644 --- a/poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js +++ b/poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js @@ -359,7 +359,8 @@ function layerDetailsPageInit (ctx) { if ($(this).is("dt")) { var dd = $(this).next("dd"); if (!dd.children("form:visible")|| !dd.find(".current-value").html()){ - if (ctx.layerVersion.layer_source == ctx.layerSourceTypes.TYPE_IMPORTED){ + if (ctx.layerVersion.layer_source == ctx.layerSourceTypes.TYPE_IMPORTED || + ctx.layerVersion.layer_source == ctx.layerSourceTypes.TYPE_LOCAL) { /* There's no current value and the layer is editable * so show the "Not set" and hide the delete icon */ diff --git a/poky/bitbake/lib/toaster/toastergui/templates/newproject.html b/poky/bitbake/lib/toaster/toastergui/templates/newproject.html index acb614e9d..bd03bb55d 100644 --- a/poky/bitbake/lib/toaster/toastergui/templates/newproject.html +++ b/poky/bitbake/lib/toaster/toastergui/templates/newproject.html @@ -54,12 +54,12 @@ <span class="help-block">{{release.helptext|safe}}</span> </div> {% endfor %} + </div> + </div> {% else %} <input type="hidden" name="projectversion" value="{{releases.0.id}}"/> {% endif %} </div> - </div> - </fieldset> {% endif %} <div class="top-air"> <input type="submit" id="create-project-button" class="btn btn-primary btn-lg" value="Create project"/> diff --git a/poky/bitbake/lib/toaster/toastergui/templates/recipe.html b/poky/bitbake/lib/toaster/toastergui/templates/recipe.html index bf2cd7169..3f76e656f 100644 --- a/poky/bitbake/lib/toaster/toastergui/templates/recipe.html +++ b/poky/bitbake/lib/toaster/toastergui/templates/recipe.html @@ -176,7 +176,7 @@ <td>{{task.get_executed_display}}</td> <td>{{task.get_outcome_display}} - {% if task.outcome = task.OUTCOME_FAILED %} + {% if task.outcome == task.OUTCOME_FAILED %} <a href="{% url 'build_artifact' build.pk "tasklogfile" task.pk %}"> <span class="glyphicon glyphicon-download-alt get-help" title="Download task log diff --git a/poky/bitbake/lib/toaster/toastergui/widgets.py b/poky/bitbake/lib/toaster/toastergui/widgets.py index a1792d997..feef7c5d9 100644 --- a/poky/bitbake/lib/toaster/toastergui/widgets.py +++ b/poky/bitbake/lib/toaster/toastergui/widgets.py @@ -511,13 +511,18 @@ class MostRecentBuildsView(View): buildrequest_id = build_obj.buildrequest.pk build['buildrequest_id'] = buildrequest_id - build['recipes_parsed_percentage'] = \ - int((build_obj.recipes_parsed / - build_obj.recipes_to_parse) * 100) - - build['repos_cloned_percentage'] = \ - int((build_obj.repos_cloned / - build_obj.repos_to_clone) * 100) + if build_obj.recipes_to_parse > 0: + build['recipes_parsed_percentage'] = \ + int((build_obj.recipes_parsed / + build_obj.recipes_to_parse) * 100) + else: + build['recipes_parsed_percentage'] = 0 + if build_obj.repos_to_clone > 0: + build['repos_cloned_percentage'] = \ + int((build_obj.repos_cloned / + build_obj.repos_to_clone) * 100) + else: + build['repos_cloned_percentage'] = 0 tasks_complete_percentage = 0 if build_obj.outcome in (Build.SUCCEEDED, Build.FAILED): |