Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 72F30E0100E; Fri, 2 Oct 2015 10:48:06 -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=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [192.55.52.88 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 838C7E00D74 for ; Fri, 2 Oct 2015 10:48:01 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 02 Oct 2015 10:47:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,624,1437462000"; d="scan'208";a="802341317" Received: from mhalasin-mobl.ger.corp.intel.com (HELO lp.ger.corp.intel.com) ([10.252.25.78]) by fmsmga001.fm.intel.com with ESMTP; 02 Oct 2015 10:47:08 -0700 From: Elliot Smith To: toaster@yoctoproject.org Date: Fri, 2 Oct 2015 18:46:48 +0100 Message-Id: <1443808009-5017-9-git-send-email-elliot.smith@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1443808009-5017-1-git-send-email-elliot.smith@intel.com> References: <1443808009-5017-1-git-send-email-elliot.smith@intel.com> Subject: [review-request][PATCH 8/9] toaster: Clean up template code 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, 02 Oct 2015 17:48:06 -0000 Some errors in the HTML template didn't show up until they were rendering command line builds. One useless conditional was lingering in another template. Clean up these issues to display the latest builds section correctly. Signed-off-by: Elliot Smith --- .../lib/toaster/toastergui/templates/builds.html | 5 ----- .../toaster/toastergui/templates/mrb_section.html | 21 ++++++++++----------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/templates/builds.html b/bitbake/lib/toaster/toastergui/templates/builds.html index 566c279..459fcb0 100644 --- a/bitbake/lib/toaster/toastergui/templates/builds.html +++ b/bitbake/lib/toaster/toastergui/templates/builds.html @@ -29,8 +29,6 @@ {% include "mrb_section.html" %} - - {% if 1 %} - - {% else %} {% include "basetable_top.html" %} @@ -117,7 +113,6 @@ {% include "basetable_bottom.html" %} {% endif %} {# objects.paginator.count #} -{% endif %} {# empty #} {% endblock %} diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index 55687a1..bd8f991 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html @@ -22,19 +22,18 @@ {% endif %}
{% for build in mru %} -
- - - {{build.project.name}} - - - {% endif %} +
+ {% if mrb_type != 'project' %} + + + {{build.project.name}} + + + {% endif %}
-
+
{%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} - + {% endif %} {% if build.target_set.all.count > 0 %}