From patchwork Sun Feb 10 21:27:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 14724 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 2824023E33 for ; Sun, 10 Feb 2013 21:27:17 +0000 (UTC) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id B84BEA18AA7 for ; Sun, 10 Feb 2013 21:27:16 +0000 (UTC) Received: by mail-vc0-f180.google.com with SMTP id fo13so3348812vcb.25 for ; Sun, 10 Feb 2013 13:27:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :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=8BYls5Ro13+AwE1fohahl2lveLUFiacbTUxRSQnYjLk=; b=SJ+zaUEmmYIjL4sswlhcAvUnSjOPSSLn94Chw28Q1rDhGxTmertJRbkgCqwNAYaOPK aEzcWbJFp06Mn4dil8VJmf2euRJwr4xu1EEHE5zR9XSQywqvdWBQf0e71IUbqTu/acqU VABWvABIxqErx3LT/LZwxr6DA1g5D6no1ieP00+fNfcXF2LVOYGY1swr7J2Uz9FCR4KW ze8Ukz+GL44wrfUpG7IiURbhyYpYMQiPIa5Gqhf11tq5Lx0MaasVwDYrOzMKBYYROkgM fPF5lafA5OOg7LE/ilQBKQXcXBca4Eujj5q7EiICQ5zea+ILppPJQqr/5YKzqjxjtGIh Qypg== X-Received: by 10.52.38.234 with SMTP id j10mr3339608vdk.0.1360531636156; Sun, 10 Feb 2013 13:27:16 -0800 (PST) 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.58.252.8 with SMTP id zo8csp67500vec; Sun, 10 Feb 2013 13:27:15 -0800 (PST) X-Received: by 10.180.79.201 with SMTP id l9mr12321309wix.20.1360531634829; Sun, 10 Feb 2013 13:27:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id bm6si5673223wib.89.2013.02.10.13.27.14 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 10 Feb 2013 13:27:14 -0800 (PST) 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 1U4eQb-00030g-VY for ; Sun, 10 Feb 2013 21:27:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id D9DD6E0270 for ; Sun, 10 Feb 2013 21:27:13 +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: 242 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-scheduler/trunk] Rev 242: prefer getting the link from the results bundle rather than the reported _results_link Message-Id: <20130210212713.18300.62022.launchpad@ackee.canonical.com> Date: Sun, 10 Feb 2013 21:27:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16482"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: f5946d42daf932c7e63834c11fa80fd0b75987f5 X-Gm-Message-State: ALoCoQnai7zA8v5m+qCcF30h/XjHD2ED8wweeIYzBLJG0kEGuPkYtlLPUbcH0AU2C9y2PRsvI+Q3 ------------------------------------------------------------ revno: 242 committer: Michael Hudson-Doyle branch nick: trunk timestamp: Mon 2013-02-11 10:26:06 +1300 message: prefer getting the link from the results bundle rather than the reported _results_link modified: lava_scheduler_app/models.py lava_scheduler_app/views.py --- 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/models.py' --- lava_scheduler_app/models.py 2013-01-30 01:31:16 +0000 +++ lava_scheduler_app/models.py 2013-02-10 21:26:06 +0000 @@ -359,10 +359,10 @@ @property def results_link(self): - if self._results_link: + if self._results_bundle: + return self._results_bundle.get_permalink() + elif self._results_link: return self._results_link - elif self._results_bundle: - return self._results_bundle.get_permalink() else: return None === modified file 'lava_scheduler_app/views.py' --- lava_scheduler_app/views.py 2013-01-30 08:31:57 +0000 +++ lava_scheduler_app/views.py 2013-02-10 21:26:06 +0000 @@ -769,7 +769,7 @@ job = get_restricted_job(request.user, pk) json_text = simplejson.dumps({ 'status': job.get_status_display(), - 'results_link': job.results_link, + 'results_link': request.build_absolute_uri(job.results_link), }) content_type = 'application/json' if 'callback' in request.GET: