From patchwork Mon Jul 16 22:10:14 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: 10016 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 C282123E56 for ; Mon, 16 Jul 2012 22:10:18 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 60060A18256 for ; Mon, 16 Jul 2012 22:10:18 +0000 (UTC) Received: by yenq6 with SMTP id q6so6021812yen.11 for ; Mon, 16 Jul 2012 15:10:17 -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=71V882R+i18DlhqGQPzpBza+cDyzm6rSo0455nUxalw=; b=oGkUv0fLC9v651ZpnaN1hfMsyi6IadKxaottxNivUNuClYo9sRAmdiz4xNlUaQdBDV A0Khq5rJ3iYRMl2Z15EbEXTH1O0nr9lKlVVEfd6ZL6CLvltR2lzh9l/KY3ZIEpHfSa66 lyOJZvCZeXYbDbjnXBKG8jl0Xi8eyT7nP9JPhsZzCZhSRwCljbZ9fn6kN6f2nIfY0qXM XIM83TtiaEeA+0yyc8guJQNcCtzLV6eBdefQajHyiIFAYtPa82vNzEfnkUFVepE+eXCH aTrXc1fnst2+5Af08ITDCAQfZTzg+B5h48U7Utjfz+DaT+LTRHQht2rnwpYstACHVciv wzhg== Received: by 10.50.203.39 with SMTP id kn7mr6339317igc.53.1342476617625; Mon, 16 Jul 2012 15:10:17 -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.241.2 with SMTP id lc2csp13247ibb; Mon, 16 Jul 2012 15:10:16 -0700 (PDT) Received: by 10.216.241.200 with SMTP id g50mr19779wer.79.1342476616304; Mon, 16 Jul 2012 15:10:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id gm1si26930017wib.34.2012.07.16.15.10.15 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Jul 2012 15:10: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 1SqtUc-0001Im-TG for ; Mon, 16 Jul 2012 22:10:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id C77D8E002B for ; Mon, 16 Jul 2012 22:10:14 +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: 197 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-scheduler/trunk] Rev 197: Misc fixes: make admin pages load faster, add links to job page and fix a Message-Id: <20120716221014.5234.60300.launchpad@ackee.canonical.com> Date: Mon, 16 Jul 2012 22:10:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15627"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: e4781e5a0fec8071b6f1e502a9fbd6d0d4295af3 X-Gm-Message-State: ALoCoQl87LUJ8bwyT1m3vVehIG7VRnMubjxly2QqFKYu2x4mODKyGnshvk8/sw9rQYA4HpnTECwR Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-scheduler/miscellany/+merge/115049 proposed by: Michael Hudson-Doyle (mwhudson) review: Approve - Andy Doan (doanac) ------------------------------------------------------------ revno: 197 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Tue 2012-07-17 10:08:49 +1200 message: Misc fixes: make admin pages load faster, add links to job page and fix a typo. modified: lava_scheduler_app/admin.py lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.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/admin.py' --- lava_scheduler_app/admin.py 2012-06-17 23:55:10 +0000 +++ lava_scheduler_app/admin.py 2012-07-15 23:49:56 +0000 @@ -38,9 +38,19 @@ class DeviceAdmin(admin.ModelAdmin): actions = [online_action, offline_action, health_unknown, retire_action] list_filter = ['device_type', 'status'] + raw_id_fields = ['current_job', 'last_health_report_job'] + + +class TestJobAdmin(admin.ModelAdmin): + raw_id_fields = ['_results_bundle'] + + +class DeviceStateTransitionAdmin(admin.ModelAdmin): + raw_id_fields = ['job'] + admin.site.register(Device, DeviceAdmin) -admin.site.register(DeviceStateTransition) +admin.site.register(DeviceStateTransition, DeviceStateTransitionAdmin) admin.site.register(DeviceType) -admin.site.register(TestJob) +admin.site.register(TestJob, TestJobAdmin) admin.site.register(Tag) === modified file 'lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html' --- lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html 2012-01-11 22:04:22 +0000 +++ lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html 2012-07-15 23:52:54 +0000 @@ -17,7 +17,9 @@ {% if job.requested_device %}
Requested device:
-
{{ job.requested_device }}
+
+ {{ job.requested_device }} +
{% endif %} {% if job.requested_device_type %} @@ -45,7 +47,9 @@ {% if job.actual_device %}
On device:
-
{{ job.actual_device }}
+
+ {{ job.actual_device }} +
{% endif %}
Submitted at:
{{ job.submit_time }}
@@ -67,7 +71,7 @@ {% endif %}
  • - Defintion + Definition
    • {% if job.results_link %}