From patchwork Tue Nov 29 09:37:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 5369 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 0212623E17 for ; Tue, 29 Nov 2011 09:44:55 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id DB0D1A18071 for ; Tue, 29 Nov 2011 09:44:54 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id h2so1236092laa.11 for ; Tue, 29 Nov 2011 01:44:54 -0800 (PST) Received: by 10.152.104.1 with SMTP id ga1mr30651423lab.40.1322559894789; Tue, 29 Nov 2011 01:44:54 -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.152.41.198 with SMTP id h6cs32947lal; Tue, 29 Nov 2011 01:44:54 -0800 (PST) Received: by 10.181.13.84 with SMTP id ew20mr47868967wid.58.1322559437443; Tue, 29 Nov 2011 01:37:17 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fk5si2676562wbb.20.2011.11.29.01.37.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Nov 2011 01:37:17 -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 1RVK7p-0007Hz-5i for ; Tue, 29 Nov 2011 09:37:17 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 23865E0435 for ; Tue, 29 Nov 2011 09:37:17 +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: 306 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 306: Fix me page when the user has no full name Message-Id: <20111129093717.13982.44785.launchpad@ackee.canonical.com> Date: Tue, 29 Nov 2011 09:37:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14399"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: f4b127c00657054c6d5bb8a9d1df582c0316eec1 ------------------------------------------------------------ revno: 306 committer: Zygmunt Krynicki branch nick: lava-server timestamp: Tue 2011-11-22 17:26:07 +0100 message: Fix me page when the user has no full name modified: lava_server/templates/me.html lava_server/views.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_server/templates/me.html' --- lava_server/templates/me.html 2011-11-08 23:55:06 +0000 +++ lava_server/templates/me.html 2011-11-22 16:26:07 +0000 @@ -13,7 +13,7 @@ {% endblock %} {% block content %} -

Hi {{ user.first_name }}

+

Hi {% firstof user.first_name user.username %}

This is where more interesting things about your actions will show up, eventually

{% endblock %} === modified file 'lava_server/views.py' --- lava_server/views.py 2011-10-27 23:25:01 +0000 +++ lava_server/views.py 2011-11-22 16:26:07 +0000 @@ -50,7 +50,8 @@ @login_required def me(request): data = { - 'bread_crumb_trail': BreadCrumbTrail.leading_to(me, you=request.user.get_full_name()) + 'bread_crumb_trail': BreadCrumbTrail.leading_to( + me, you=request.user.get_full_name() or request.user.username) } context = RequestContext(request, data) template = loader.get_template('me.html')