From patchwork Tue Oct 4 23:06:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 4511 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 0BFFB23EF6 for ; Tue, 4 Oct 2011 23:06:17 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id EF365A18A2E for ; Tue, 4 Oct 2011 23:06:16 +0000 (UTC) Received: by eyb6 with SMTP id 6so1443092eyb.11 for ; Tue, 04 Oct 2011 16:06:16 -0700 (PDT) Received: by 10.223.45.140 with SMTP id e12mr2484835faf.27.1317769576781; Tue, 04 Oct 2011 16:06:16 -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.152.23.170 with SMTP id n10cs71587laf; Tue, 4 Oct 2011 16:06:16 -0700 (PDT) Received: by 10.216.19.75 with SMTP id m53mr5467333wem.73.1317769576067; Tue, 04 Oct 2011 16:06:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id e43si7073205wed.92.2011.10.04.16.06.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 04 Oct 2011 16:06:16 -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 1RBE3z-000237-Hv for ; Tue, 04 Oct 2011 23:06:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 7E4ADE0A5B for ; Tue, 4 Oct 2011 23:06:15 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-scheduler X-Launchpad-Branch: ~linaro-validation/lava-scheduler/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 81 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-scheduler/trunk] Rev 81: Make other references to the test device in the scheduler link to the details page for that device Message-Id: <20111004230615.13988.91104.launchpad@ackee.canonical.com> Date: Tue, 04 Oct 2011 23:06:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14085"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 8dde3c026e661b5f777b1e275a2fa5dee9e81fa1 Merge authors: Paul Larson (pwlars) Paul Larson Related merge proposals: https://code.launchpad.net/~pwlars/lava-scheduler/fix-device-links-863757/+merge/77779 proposed by: Paul Larson (pwlars) review: Approve - Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 81 [merge] committer: Paul Larson branch nick: lava-scheduler timestamp: Tue 2011-10-04 18:04:50 -0500 message: Make other references to the test device in the scheduler link to the details page for that device modified: lava_scheduler_app/templates/lava_scheduler_app/alljobs.html lava_scheduler_app/templates/lava_scheduler_app/index.html --- lp:lava-scheduler https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk You are subscribed to branch lp:lava-scheduler. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription === modified file 'lava_scheduler_app/templates/lava_scheduler_app/alljobs.html' --- lava_scheduler_app/templates/lava_scheduler_app/alljobs.html 2011-08-30 04:49:17 +0000 +++ lava_scheduler_app/templates/lava_scheduler_app/alljobs.html 2011-10-04 22:58:15 +0000 @@ -24,7 +24,15 @@ {{ job.id }} {{ job.get_status_display }} - {{ job.actual_device|default:'' }} + {% if job.actual_device.pk %} + + {{ job.actual_device }} + {% else %}{% if job.requested_device.pk %} + + {{ job.requested_device }} + {% else %} + {{ job.requested_device_type|default:'' }} + {% endif %}{% endif %} {{ job.submitter }} {{ job.submit_time }} === modified file 'lava_scheduler_app/templates/lava_scheduler_app/index.html' --- lava_scheduler_app/templates/lava_scheduler_app/index.html 2011-08-30 04:49:17 +0000 +++ lava_scheduler_app/templates/lava_scheduler_app/index.html 2011-10-04 22:58:15 +0000 @@ -43,7 +43,15 @@ {{ job.id }} {{ job.get_status_display }} - {{ job.actual_device|default:'' }} + {% if job.actual_device.pk %} + + {{ job.actual_device }} + {% else %}{% if job.requested_device.pk %} + + {{ job.requested_device }} + {% else %} + {{ job.requested_device_type|default:'' }} + {% endif %}{% endif %} {{ job.submitter }} {{ job.submit_time }}