From patchwork Sun Apr 22 23:22:12 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: 8003 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 BF4F023E42 for ; Sun, 22 Apr 2012 23:22:14 +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 6CB32A18238 for ; Sun, 22 Apr 2012 23:22:14 +0000 (UTC) Received: by iage36 with SMTP id e36so21738427iag.11 for ; Sun, 22 Apr 2012 16:22:13 -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=vg3Ebi0fCFA/X96osM03NdsXhrBQu4MMkwNJr4sMlrQ=; b=DEAodu+jEi2pX22u6ZC0dVhX6CH6mET7clx2cwxywHhaGSGit7OD9tEjF2d+TtUTFk 7Rj2/Rdi2kFaE4GUCnUdv+ZQ2HNFtdv0CZ+1K/ZkkHBd4lD4RMkiEZsI4GyFL7h4Kblh 1Nl19GPn55ajACPh3xFBPb7+5d6oy5JomtZroUQ28cSb9/r604TIkKDeAZHRuBGNWeGb FYYp5E6tiuZ/REjMsRHEzPGmPeQhBDeDHguZ0fVZ44NIrAj56lciQ6vKngsMQbzupOPs QkYjcmkCAoFmk5BRYCrIS//dA20Apcton6FFkKRAc1HrqKsPcle7LEiYRg30DbhAyWv3 TE9Q== Received: by 10.50.185.233 with SMTP id ff9mr4756946igc.55.1335136933898; Sun, 22 Apr 2012 16:22:13 -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 x6csp76078ibt; Sun, 22 Apr 2012 16:22:13 -0700 (PDT) Received: by 10.216.131.78 with SMTP id l56mr8397668wei.94.1335136932708; Sun, 22 Apr 2012 16:22:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id t6si6877737wiz.4.2012.04.22.16.22.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Apr 2012 16:22:12 -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 1SM66e-0006co-4r for ; Sun, 22 Apr 2012 23:22:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 139FAE087A for ; Sun, 22 Apr 2012 23:22:12 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 361 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 361: add ajax_table.html to lava-server from lava-scheduler (Chris Johnston) Message-Id: <20120422232212.14767.40471.launchpad@ackee.canonical.com> Date: Sun, 22 Apr 2012 23:22:12 -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: 117cb3079a0477371466d27b6143911312e6080f X-Gm-Message-State: ALoCoQm6MTzxpA/11apKhRH9DwTbK64VrjMpcgPdsgNv4/vBmAxZyPTZErJaegSPAquNmYASfCvn Merge authors: Chris Johnston (chrisjohnston) Related merge proposals: https://code.launchpad.net/~chrisjohnston/lava-server/move-ajax-table-html/+merge/102929 proposed by: Chris Johnston (chrisjohnston) review: Approve - Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 361 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Mon 2012-04-23 11:20:22 +1200 message: add ajax_table.html to lava-server from lava-scheduler (Chris Johnston) added: lava_server/templates/ajax_table.html modified: lava/utils/data_tables/tables.py --- lp:lava-server https://code.launchpad.net/~linaro-validation/lava-server/trunk You are subscribed to branch lp:lava-server. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription === modified file 'lava/utils/data_tables/tables.py' --- lava/utils/data_tables/tables.py 2012-03-08 00:11:20 +0000 +++ lava/utils/data_tables/tables.py 2012-04-20 19:58:36 +0000 @@ -123,7 +123,7 @@ method. """ if template is None: - template = 'lava_scheduler_app/ajax_table.html' + template = 'ajax_table.html' # The reason we pass data=[] here and patch the queryset in below is # because of a bootstrapping issue. We want to sort the initial # queryset, and this is much cleaner if the table has has its .columns === added file 'lava_server/templates/ajax_table.html' --- lava_server/templates/ajax_table.html 1970-01-01 00:00:00 +0000 +++ lava_server/templates/ajax_table.html 2012-04-20 19:58:36 +0000 @@ -0,0 +1,25 @@ +{% extends "django_tables2/table.html" %} + +{% block table.thead %} + + + {% for column in table.columns %} + {{ column.header }} + {% endfor %} + + +{% endblock table.thead %} + +{% block table %} +{{ block.super }} +{% comment %} +The div below is a ridiculous hack to avoid the jQuery.details.js +setting the display: of the script element to "block" when showing a +table that is in a
element. +{% endcomment %} +
+ +
+{% endblock %}