From patchwork Fri Jul 15 00:02:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 2705 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 D56A023F51 for ; Fri, 15 Jul 2011 00:02:47 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 84F5CA1866E for ; Fri, 15 Jul 2011 00:02:47 +0000 (UTC) Received: by qwb8 with SMTP id 8so541145qwb.11 for ; Thu, 14 Jul 2011 17:02:47 -0700 (PDT) Received: by 10.229.25.212 with SMTP id a20mr2222476qcc.148.1310688166922; Thu, 14 Jul 2011 17:02:46 -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.229.217.78 with SMTP id hl14cs30802qcb; Thu, 14 Jul 2011 17:02:46 -0700 (PDT) Received: by 10.216.54.197 with SMTP id i47mr197469wec.48.1310688165380; Thu, 14 Jul 2011 17:02:45 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id t83si1723362weq.41.2011.07.14.17.02.44; Thu, 14 Jul 2011 17:02:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QhVrf-0006SS-K2 for ; Fri, 15 Jul 2011 00:02:43 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 9FDEC2E890E for ; Fri, 15 Jul 2011 00:02:23 +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: 244 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 244: Merge 0.6b3 changes Message-Id: <20110715000223.28860.71055.launchpad@loganberry.canonical.com> Date: Fri, 15 Jul 2011 00:02:23 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13405"; Instance="initZopeless config overlay" X-Launchpad-Hash: 291d2b0727f7b910d31662e9648994d23f9e0c5e Merge authors: Zygmunt Krynicki (zkrynicki) Related merge proposals: https://code.launchpad.net/~linaro-validation/lava-dashboard/0.6b3/+merge/68042 proposed by: Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 244 [merge] committer: Zygmunt Krynicki branch nick: lava-dashboard timestamp: Fri 2011-07-15 02:00:35 +0200 message: Merge 0.6b3 changes Note: I removed the two symlinks I added by accident removed: production/reports/ production/views/ modified: dashboard_app/__init__.py dashboard_app/templates/dashboard_app/_test_run_list_table.html dashboard_app/templates/dashboard_app/bundle_list.html dashboard_app/templates/dashboard_app/test_run_detail.html 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/__init__.py' --- dashboard_app/__init__.py 2011-07-13 11:12:37 +0000 +++ dashboard_app/__init__.py 2011-07-13 17:29:34 +0000 @@ -20,4 +20,4 @@ Dashboard Application (package) """ -__version__ = (0, 6, 0, "beta", 2) +__version__ = (0, 6, 0, "beta", 3) === modified file 'dashboard_app/templates/dashboard_app/_test_run_list_table.html' --- dashboard_app/templates/dashboard_app/_test_run_list_table.html 2011-07-12 02:34:12 +0000 +++ dashboard_app/templates/dashboard_app/_test_run_list_table.html 2011-07-13 17:28:32 +0000 @@ -5,7 +5,7 @@ {% trans "Test Run" %} {% trans "Test" %} {% trans "Uploaded On" %} - {% trans "Analyzed" %} + {% trans "Analyzed On" %} {% trans "Pass" %} {% trans "Fail" %} {% trans "Skip" %} @@ -17,8 +17,8 @@ {{ test_run.analyzer_assigned_uuid }} {{ test_run.test }} - {{ test_run.bundle.uploaded_on }} - {{ test_run.analyzer_assigned_date }} + {{ test_run.bundle.uploaded_on|date:"Y-m-d H:i:s" }} + {{ test_run.analyzer_assigned_date|date:"Y-m-d H:i:s" }} {% with test_run.get_summary_results as summary %} {{ summary.pass|default:0 }} {{ summary.fail|default:0 }} === modified file 'dashboard_app/templates/dashboard_app/bundle_list.html' --- dashboard_app/templates/dashboard_app/bundle_list.html 2011-07-12 03:00:26 +0000 +++ dashboard_app/templates/dashboard_app/bundle_list.html 2011-07-13 17:28:32 +0000 @@ -72,7 +72,7 @@ {% for bundle in bundle_list %} {{ bundle.content_sha1 }} - {{ bundle.uploaded_on }} + {{ bundle.uploaded_on|date:"Y-m-d H:i:s"}} {% if bundle.uploaded_by %} {{ bundle.uploaded_by }} === modified file 'dashboard_app/templates/dashboard_app/test_run_detail.html' --- dashboard_app/templates/dashboard_app/test_run_detail.html 2011-07-12 02:34:12 +0000 +++ dashboard_app/templates/dashboard_app/test_run_detail.html 2011-07-13 17:28:46 +0000 @@ -28,7 +28,7 @@ {{ test_result.test_case|default_if_none:"Not specified" }} - {{ test_result.get_result_display }} {{ test_result.get_result_display }} === modified file 'dashboard_app/views.py' --- dashboard_app/views.py 2011-07-13 12:29:53 +0000 +++ dashboard_app/views.py 2011-07-13 17:28:57 +0000 @@ -327,7 +327,7 @@ @BreadCrumb( "{content_filename}", parent=attachment_list, - needs=['pathname', 'content_sha1', 'analyzer_assigned_uuid', 'content_filename']) + needs=['pathname', 'content_sha1', 'analyzer_assigned_uuid', 'pk']) def attachment_detail(request, pathname, content_sha1, analyzer_assigned_uuid, pk): attachment = get_restricted_object_or_404( Attachment, @@ -342,6 +342,7 @@ pathname=pathname, content_sha1=content_sha1, analyzer_assigned_uuid=analyzer_assigned_uuid, + pk=pk, content_filename=attachment.content_filename), "attachment": attachment, }, RequestContext(request)) === removed directory 'production/reports' === removed directory 'production/views'