From patchwork Sun Apr 22 23:45:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 8005 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9CC0923E20 for ; Sun, 22 Apr 2012 23:45:20 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4E085A18259 for ; Sun, 22 Apr 2012 23:45:20 +0000 (UTC) Received: by iage36 with SMTP id e36so21761567iag.11 for ; Sun, 22 Apr 2012 16:45:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=ytcmf9hQi3XvvKXkRLSm7p5z9Z/Lrm3A8S7XDBq2lt4=; b=kB6Y8dKeOTTWGxOGhmXYuueBogfZxkmgkvh9kXJqX10Fpa/g+Onu44Gr9yizfPO+5N MdVZhnm8eRchvw3naPqn6wb6uj34EN/RSx2KQtaDVLV/ijnuc5oIb9oARFwYuCGbdr6Y vfJUfiBdRylyZfaCnevIZ041XK7WlA/HF91IZnLVvsJRL7yfi1NL3XfVuofRbvCkGblv wM4hMXLur5MKY5ZZyKD3zqxMxJZFqUfRnM512JIMq8UYggW0MFBD0LSobhYQdvPNbE9/ 1VQahDvFjbnQXWeq+KllHl91jGuvPNdYgEYyFNH1nNX744apK00AudKoQ5j5+VJLY0p3 DBvQ== Received: by 10.50.207.38 with SMTP id lt6mr924598igc.55.1335138319783; Sun, 22 Apr 2012 16:45:19 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.137.198 with SMTP id x6csp76684ibt; Sun, 22 Apr 2012 16:45:19 -0700 (PDT) Received: by 10.216.139.229 with SMTP id c79mr10053106wej.16.1335138318463; Sun, 22 Apr 2012 16:45:18 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id k8si13571086wed.98.2012.04.22.16.45.18 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Apr 2012 16:45:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1SM6Sz-0002pp-Ss for ; Sun, 22 Apr 2012 23:45:17 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id CB5A9E087E for ; Sun, 22 Apr 2012 23:45:17 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dashboard X-Launchpad-Branch: ~linaro-validation/lava-dashboard/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 312 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 312: actually display the number of fails in the bundle stream view (Andy Doan) Message-Id: <20120422234517.20035.63302.launchpad@ackee.canonical.com> Date: Sun, 22 Apr 2012 23:45:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15120"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 4d2e48767c811d2cba62e223673db8373cc825c0 X-Gm-Message-State: ALoCoQlaqycuF2oaHVV8N8VraGHy7ImMbNKKc8MgFppb9daTr3Pp4wCAMvxNvBG7AqVk6rKjd5t5 Merge authors: Andy Doan (doanac) Related merge proposals: https://code.launchpad.net/~doanac/lava-dashboard/pass-fail-fix/+merge/102946 proposed by: Andy Doan (doanac) review: Approve - Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 312 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Mon 2012-04-23 11:43:06 +1200 message: actually display the number of fails in the bundle stream view (Andy Doan) modified: dashboard_app/views.py --- lp:lava-dashboard https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk You are subscribed to branch lp:lava-dashboard. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription === modified file 'dashboard_app/views.py' --- dashboard_app/views.py 2012-03-26 04:05:55 +0000 +++ dashboard_app/views.py 2012-04-20 22:55:12 +0000 @@ -164,8 +164,8 @@ '{{ record.content_filename }}', verbose_name="bundle name") - passes = TemplateColumn('{{ record.get_summary_results.pass }}') - fails = TemplateColumn('{{ record.get_summary_results.pass }}') + passes = TemplateColumn('{{ record.get_summary_results.pass|default:"0" }}') + fails = TemplateColumn('{{ record.get_summary_results.fail|default:"0" }}') total_results = TemplateColumn('{{ record.get_summary_results.total }}') uploaded_on = TemplateColumn('{{ record.uploaded_on|date:"Y-m-d H:i:s"}}') @@ -346,7 +346,7 @@ "analyzer_assigned_date", # used by the view "bundle__uploaded_on", # needed by Bundle.get_absolute_url "bundle__content_sha1", # needed by Bundle.get_absolute_url - "bundle__bundle_stream__pathname", # Needed by TestRun.get_absolute_url + "bundle__bundle_stream__pathname", # Needed by TestRun.get_absolute_url "test__name", # needed by Test.__unicode__ "test__test_id", # needed by Test.__unicode__ ) @@ -553,7 +553,7 @@ template_object_name="attachment", extra_context={ 'bread_crumb_trail': BreadCrumbTrail.leading_to( - attachment_list, + attachment_list, pathname=pathname, content_sha1=content_sha1, analyzer_assigned_uuid=analyzer_assigned_uuid), @@ -646,14 +646,14 @@ try: data_view = DataView.repository.get(name=name) except DataView.DoesNotExist: - raise Http404('No data view matches the given query.') + raise Http404('No data view matches the given query.') return render_to_response( "dashboard_app/data_view_detail.html", { 'bread_crumb_trail': BreadCrumbTrail.leading_to( data_view_detail, name=data_view.name, summary=data_view.summary), - "data_view": data_view + "data_view": data_view }, RequestContext(request)) @@ -756,7 +756,7 @@ from lava_projects.models import Project -from lava_projects.views import project_detail +from lava_projects.views import project_detail from dashboard_app.forms import TestingEffortForm @@ -802,7 +802,7 @@ parent=testing_effort_detail, needs=["pk"]) @login_required -def testing_effort_update(request, pk): +def testing_effort_update(request, pk): try: effort = TestingEffort.objects.get(pk=pk) except TestingEffort.DoesNotExist: