From patchwork Wed Jul 3 12:14:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stevan Radakovic X-Patchwork-Id: 18251 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CE26025E04 for ; Wed, 3 Jul 2013 12:14:18 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id u12sf47435qcx.0 for ; Wed, 03 Jul 2013 05:14:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to :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:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=+B7JZ4vYReWt3/jNV548Gs0nhv/4JLnuj/UvLa5ZE4s=; b=Msj0Wb0M2NY/S66fnxsGcQ+tDVJz6EG5uovCxsYFgB7VWXnmypYTmwVU+OjnxOm0zM Y5nyL+WOWh4U7drVLNtZcHIMdcjuLRrYn7J0NYRVhyn9P4hsH0nLgHfAFeTrn6mpH0yj koE8+hF57sqJKKUixh8t9nTVRG4ZshyrCGW37AxqEXZ33h5ii5xBIomXTiiYUeDaj6a5 vC5YIzHdXxN1r9oXDXpfr8WxuuuLD8RNzng/3bDtOhNeGZKSYFmnrJqHhjr38AGRNMVr 0YXZiHFOjCrNvf19eKrStvGO+7wIyAWlc6o8Aiy/arR8HhUSwHfWxfx4nQVsFtxhRQEe 1xyg== X-Received: by 10.224.2.137 with SMTP id 9mr2135690qaj.2.1372853658189; Wed, 03 Jul 2013 05:14:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.107.129 with SMTP id hc1ls208628qeb.78.gmail; Wed, 03 Jul 2013 05:14:17 -0700 (PDT) X-Received: by 10.220.50.66 with SMTP id y2mr152155vcf.84.1372853657915; Wed, 03 Jul 2013 05:14:17 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id ya5si7023036vec.95.2013.07.03.05.14.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Jul 2013 05:14:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id oz10so42702veb.33 for ; Wed, 03 Jul 2013 05:14:17 -0700 (PDT) X-Received: by 10.58.119.233 with SMTP id kx9mr217071veb.3.1372853657802; Wed, 03 Jul 2013 05:14:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp49431veb; Wed, 3 Jul 2013 05:14:17 -0700 (PDT) X-Received: by 10.15.98.203 with SMTP id bj51mr847259eeb.22.1372853656860; Wed, 03 Jul 2013 05:14:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id n7si17242833eey.147.2013.07.03.05.14.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Jul 2013 05:14: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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UuLwu-0008DR-8P for ; Wed, 03 Jul 2013 12:14:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 2BC4BE0772 for ; Wed, 3 Jul 2013 12:14:16 +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: 411 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 411: Fix bug #1197322. Message-Id: <20130703121416.18863.82767.launchpad@ackee.canonical.com> Date: Wed, 03 Jul 2013 12:14:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16692"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 03f710bdf8bac2d1d390ea1c4cf32c0aadb342b5 X-Gm-Message-State: ALoCoQmVHOsyk4l4vL5reXkpCzwrB9X2Uy+F2jmvHUyadIo0a9wedk/G7GpeTwTzJ2/N5TZPkxW9 X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Stevan Radaković (stevanr) Related merge proposals: https://code.launchpad.net/~stevanr/lava-dashboard/fix-1197322/+merge/172791 proposed by: Stevan Radaković (stevanr) review: Approve - Senthil Kumaran S (stylesen) ------------------------------------------------------------ revno: 411 [merge] committer: Stevan Radakovic branch nick: trunk timestamp: Wed 2013-07-03 14:13:39 +0200 message: Fix bug #1197322. modified: dashboard_app/static/dashboard_app/js/image-report.js dashboard_app/views/images.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/static/dashboard_app/js/image-report.js' --- dashboard_app/static/dashboard_app/js/image-report.js 2013-07-01 15:49:15 +0000 +++ dashboard_app/static/dashboard_app/js/image-report.js 2013-07-03 11:42:45 +0000 @@ -284,7 +284,6 @@ // Get the plot data. data = []; - units = ""; for (test in table_data) { if ($("#test_select").val().indexOf(test) >= 0) { @@ -306,7 +305,6 @@ } else { // measurements if (row[iter]["measurements"] && row[iter]["measurements"].length != 0) { row_data.push([iter, row[iter]["measurements"][0]["measurement"]]); - units = row[iter]["measurements"][0]["units"]; } } } @@ -376,15 +374,6 @@ options["yaxis"]["min"] = 0; } - if (units != "") { - options["legend"]["labelFormatter"] = function(label, series) { - if (label.length > 20) { - return label.substring(0,20) + "..."; - } - return label + " (" + units + ")"; - } - } - $.plot($("#outer-container #inner-container"), data, options); } === modified file 'dashboard_app/views/images.py' --- dashboard_app/views/images.py 2013-07-01 15:49:15 +0000 +++ dashboard_app/views/images.py 2013-07-03 11:42:45 +0000 @@ -89,10 +89,7 @@ cls = 'present fail' bug_ids = sorted([b.bug_id for b in test_run.launchpad_bugs.all()]) - measurements = [{'item': str(item.test_case), - 'measurement': str(item.measurement), - 'units': str(item.units) - } + measurements = [{'measurement': str(item.measurement)} for item in test_run.test_results.all()] test_run_data = dict(