From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 437B2E00D1F; Fri, 10 Jun 2016 04:53:59 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [209.85.192.179 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-pf0-f179.google.com (mail-pf0-f179.google.com [209.85.192.179]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 07730E00D0E for ; Fri, 10 Jun 2016 04:53:55 -0700 (PDT) Received: by mail-pf0-f179.google.com with SMTP id t190so23088028pfb.3 for ; Fri, 10 Jun 2016 04:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=inCpr4MYbvz+eNatrdVqM5gwp40Yr+xjU1eWc7uZqLY=; b=cOrFGgzHLePhWEjQKLpyZFG7ndu7F7OB1MUyZqcWSTItT+6qckdrkWC79AljreBJ4a wBi+DmNlxhPvuojojesuynJCW5ZwSmqwTheb9O+o8oYwww95u95raLwXcki9k17+aDx0 XEG+k2u2++0y/Z+H+rUU+aLZ0Wb8gHffkcsLPbTVxKpcT/K3GUCaXPAOBtMNQKcp0dEx 2vSBjEHfqanEItlAOD3TUOqK1NwN2KMi/KM6rm2uuVofH4utTydI9qYiQSLL0AmdFJdK UqFaWjcN8Id/3uLSAJbka4i110BN2qQXOsesQ7XrlEb7MUumph63Fw7Ghgs3jo6VtS3B tsVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=inCpr4MYbvz+eNatrdVqM5gwp40Yr+xjU1eWc7uZqLY=; b=F8hLRcS2Dm5TEOt7DStf6rDqV0D/1dh3fe8aDPuY7FMNK1gU99dJzcnpJiK2bx0VWj D2cGXIhUwFiIIywaEtGzeQJGwa6CsbOSHYnNQzKrJhatcQ3nrqZTXT9vixBa+MeoGV2r Jt7daCq+Z0XCj5EpqounbX70SQufVKLievDWvWXgtRaF9LXKZ3rNjmwspjveyjgAUl45 0TN3q1SbFsIkPEOVwObVO0fxhLIxKCo1MgvAtfM782U/J71/zB1GcmQhHav0t1UW0Z+J Yj7WthfZe39aDTAqnOoRV2ij5TZZH4n/cUWS24qQ1ja7wUib1OoCLXgInDPMyOX9uNU1 dbvQ== X-Gm-Message-State: ALyK8tJ7RfUNU0DZMGvbmQ3ySx2j/zXlyOuDI7HljkqbJbs0KWp1Yf1jcNBLSLtIX+aWjn2v X-Received: by 10.98.106.65 with SMTP id f62mr1959316pfc.126.1465559634667; Fri, 10 Jun 2016 04:53:54 -0700 (PDT) Received: from [192.168.0.78] (host109-150-165-138.range109-150.btcentralplus.com. [109.150.165.138]) by smtp.googlemail.com with ESMTPSA id i17sm17208058pfj.77.2016.06.10.04.53.53 for (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Jun 2016 04:53:54 -0700 (PDT) To: toaster@yoctoproject.org References: <1465478673-23191-1-git-send-email-belen.barros.pena@linux.intel.com> <1465478673-23191-9-git-send-email-belen.barros.pena@linux.intel.com> From: Michael Wood Message-ID: <575AAA50.9020306@intel.com> Date: Fri, 10 Jun 2016 12:53:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <1465478673-23191-9-git-send-email-belen.barros.pena@linux.intel.com> Subject: Re: [PATCH 08/20] toaster: build data Tasks table to Bootstrap 3 X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2016 11:53:59 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit On 09/06/16 14:24, Belen Barros Pena wrote: > Make sure the tasks table and all build performance tables display > correctly with Bootstrap 3. > > Signed-off-by: Belen Barros Pena > --- > bitbake/lib/toaster/toastergui/buildtables.py | 39 +++++++++++----------- > .../templates/buildinfo-toastertable.html | 4 +-- > 2 files changed, 22 insertions(+), 21 deletions(-) > > diff --git a/bitbake/lib/toaster/toastergui/buildtables.py b/bitbake/lib/toaster/toastergui/buildtables.py > index 5d00aa4..b92d405 100644 > --- a/bitbake/lib/toaster/toastergui/buildtables.py > +++ b/bitbake/lib/toaster/toastergui/buildtables.py > @@ -426,9 +426,7 @@ class BuildTasksTable(BuildTablesMixin): > '' > > recipe_version_tmpl =\ > - ''\ > - '{{data.recipe.version}}'\ > - '' > + '{{data.recipe.version}}' As you've removed the template we no longer need recipe_version_tmpl, it can just be changed to display the field as normal. > > def task_link_tmpl(val): > return (' @@ -438,7 +436,13 @@ class BuildTasksTable(BuildTablesMixin): > > self.add_column(title="Order", > static_data_name="order", > - static_data_template=task_link_tmpl('{{data.order}}'), > + static_data_template='{{data.order}}', > + orderable=True) > + > + self.add_column(title="Task", > + static_data_name="task_name", > + static_data_template=task_link_tmpl( > + "{{data.task_name}}"), > orderable=True) > > self.add_column(title="Recipe", > @@ -450,31 +454,24 @@ class BuildTasksTable(BuildTablesMixin): > static_data_name='recipe__version', > static_data_template=recipe_version_tmpl) > > - self.add_column(title="Task", > - static_data_name="task_name", > - static_data_template=task_link_tmpl( > - "{{data.task_name}}"), > - orderable=True) > - > self.add_column(title="Executed", > static_data_name="task_executed", > - static_data_template=task_link_tmpl( > - "{{data.get_executed_display}}"), > + static_data_template='{{data.get_executed_display}}', > filter_name='execution_outcome', > orderable=True) > > self.static_context_extra['OUTCOME_FAILED'] = Task.OUTCOME_FAILED > - outcome_tmpl = task_link_tmpl("{{data.outcome_text}}") > + outcome_tmpl = '{{data.outcome_text}}' > outcome_tmpl = ('%s ' > '{%% if data.outcome = extra.OUTCOME_FAILED %%}' > ' ' "tasklogfile" data.pk %%}">' > - ' - ' title="Download task log file">' > + ' + ' title="Download task log file">' > ' {%% endif %%}' > - ' 'hover-help" style="visibility: hidden;" ' > - 'title="{{data.get_outcome_help}}">' > + 'title="{{data.get_outcome_help}}">' > ) % outcome_tmpl > > self.add_column(title="Outcome", > @@ -483,10 +480,11 @@ class BuildTasksTable(BuildTablesMixin): > filter_name="task_outcome", > orderable=True) > > + self.toggle_columns['sstate_result'] = len(self.columns) > + > self.add_column(title="Cache attempt", > static_data_name="sstate_result", > - static_data_template=task_link_tmpl( > - "{{data.sstate_text}}"), > + static_data_template='{{data.sstate_text}}', > filter_name="sstate_outcome", > orderable=True) > > @@ -542,6 +540,7 @@ class BuildTimeTable(BuildTasksTable): > super(BuildTimeTable, self).setup_columns(**kwargs) > > self.columns[self.toggle_columns['order']]['hidden'] = True > + self.columns[self.toggle_columns['sstate_result']]['hidden'] = True > self.columns[self.toggle_columns['elapsed_time']]['hidden'] = False > > > @@ -556,6 +555,7 @@ class BuildCPUTimeTable(BuildTasksTable): > super(BuildCPUTimeTable, self).setup_columns(**kwargs) > > self.columns[self.toggle_columns['order']]['hidden'] = True > + self.columns[self.toggle_columns['sstate_result']]['hidden'] = True > self.columns[self.toggle_columns['cpu_time_sys']]['hidden'] = False > self.columns[self.toggle_columns['cpu_time_user']]['hidden'] = False > > @@ -571,4 +571,5 @@ class BuildIOTable(BuildTasksTable): > super(BuildIOTable, self).setup_columns(**kwargs) > > self.columns[self.toggle_columns['order']]['hidden'] = True > + self.columns[self.toggle_columns['sstate_result']]['hidden'] = True > self.columns[self.toggle_columns['disk_io']]['hidden'] = False > diff --git a/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html b/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html > index 52cc056..eb4c656 100644 > --- a/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html > +++ b/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html > @@ -11,10 +11,10 @@ > {% endblock %} > > {% block buildinfomain %} > -
> +
> {# xhr_table_url is just the current url so leave it blank #} > {% with xhr_table_url='' %} > -
> +
>

> {{title}} (0)

>