From patchwork Thu Aug 27 14:14:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 1352600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BclFm044tz9sRK for ; Fri, 28 Aug 2020 00:18:36 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=LDy1MMxd; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BclFl4chxzDqH5 for ; Fri, 28 Aug 2020 00:18:35 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=ajd@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=LDy1MMxd; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Bcl953sMHzDqck for ; Fri, 28 Aug 2020 00:14:31 +1000 (AEST) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07RE2gUh097195 for ; Thu, 27 Aug 2020 10:14:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=AMYEztGXYFOD7kU+Zf5T9m9fJyyl3wePhM8Ci8JQgyA=; b=LDy1MMxdy1G9igLIYM0QobHj6CrUcJyoDe9do7arvncyVcpM793ctxkq0nWFOw2pju/+ tMQpX4LYWZZZglIvqCz/I8/AyImpEW6QPpTUUPz7puo5CRbr/4NH7v2QEeWzO3uy7Axp B6xcavVU1gVzAtVnTGUhc2OSAXwIJkeDTJjqDbrd9PQBFLeeECFBeMrPPJrIk87RxHOa ZsIAFMFaKZt5Ozn6NDpnkmOWI805crxU4sVusePXGDefhFdMTZU2So5MM/7uCeWCsRkl uKHf9tcLvy9jHNPqkMr2Uee0OXzkEesFC408T81q2yBpxQu+2fmXp9J+SFr2hRo3vHCl xQ== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 336djj1yht-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 10:14:29 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 07RECZ2F013296 for ; Thu, 27 Aug 2020 14:14:26 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma06ams.nl.ibm.com with ESMTP id 332uk6ds28-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Aug 2020 14:14:26 +0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 07REEOH023265646 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 Aug 2020 14:14:24 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1B8B55204E for ; Thu, 27 Aug 2020 14:14:24 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 6CE2752054 for ; Thu, 27 Aug 2020 14:14:23 +0000 (GMT) Received: from intelligence.ibm.com (unknown [9.81.217.160]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id DE32FA0226 for ; Fri, 28 Aug 2020 00:14:21 +1000 (AEST) From: Andrew Donnellan To: patchwork@lists.ozlabs.org Subject: [PATCH 1/5] templates: Replace ifequal and ifnotequal with if Date: Fri, 28 Aug 2020 00:14:02 +1000 Message-Id: <20200827141406.18231-1-ajd@linux.ibm.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-27_07:2020-08-27, 2020-08-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 mlxlogscore=636 malwarescore=0 spamscore=0 phishscore=0 clxscore=1015 suspectscore=1 priorityscore=1501 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008270103 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Django 3.1 deprecates the ifequal and ifnotequal tags, for removal in 4.0. Replace all occurrences of ifequal and ifnotequal with if. Signed-off-by: Andrew Donnellan Reviewed-by: Stephen Finucane --- .../patchwork/partials/pagination.html | 8 ++++---- .../patchwork/partials/patch-list.html | 20 +++++++++---------- patchwork/templates/patchwork/profile.html | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/patchwork/templates/patchwork/partials/pagination.html b/patchwork/templates/patchwork/partials/pagination.html index 04f4d16671c2..ee4b555d62c2 100644 --- a/patchwork/templates/patchwork/partials/pagination.html +++ b/patchwork/templates/patchwork/partials/pagination.html @@ -1,6 +1,6 @@ {% load listurl %} -{% ifnotequal page.paginator.num_pages 1 %} +{% if page.paginator.num_pages != 1 %}
{% if page.has_previous %} @@ -18,12 +18,12 @@ {% endif %} {% for p in page.paginator.adjacent_set %} - {% ifequal p page.number %} + {% if p == page.number %} {{ p }} {% else %} {{ p }} - {% endifequal %} + {% endif %} {% endfor %} {% if page.paginator.leading_set %} @@ -42,4 +42,4 @@ » {% endif %}
-{% endifnotequal %} +{% endif %} diff --git a/patchwork/templates/patchwork/partials/patch-list.html b/patchwork/templates/patchwork/partials/patch-list.html index 985e9bee05a0..02d6dff87c97 100644 --- a/patchwork/templates/patchwork/partials/patch-list.html +++ b/patchwork/templates/patchwork/partials/patch-list.html @@ -71,7 +71,7 @@ $(document).ready(function() { {% endif %} - {% ifequal order.name "name" %} + {% if order.name == "name" %} @@ -84,7 +84,7 @@ $(document).ready(function() { {% else %} Patch {% endif %} - {% endifequal %} + {% endif %} @@ -100,7 +100,7 @@ $(document).ready(function() { - {% ifequal order.name "date" %} + {% if order.name == "date" %} @@ -113,11 +113,11 @@ $(document).ready(function() { {% else %} Date {% endif %} - {% endifequal %} + {% endif %} - {% ifequal order.name "submitter" %} + {% if order.name == "submitter" %} @@ -132,11 +132,11 @@ $(document).ready(function() { {% else %} Submitter {% endif %} - {% endifequal %} + {% endif %} - {% ifequal order.name "delegate" %} + {% if order.name == "delegate" %} @@ -149,11 +149,11 @@ $(document).ready(function() { {% else %} Delegate {% endif %} - {% endifequal %} + {% endif %} - {% ifequal order.name "state" %} + {% if order.name == "state" %} @@ -166,7 +166,7 @@ $(document).ready(function() { {% else %} State {% endif %} - {% endifequal %} + {% endif %} diff --git a/patchwork/templates/patchwork/profile.html b/patchwork/templates/patchwork/profile.html index 4ca78dae430e..4a4b55826d03 100644 --- a/patchwork/templates/patchwork/profile.html +++ b/patchwork/templates/patchwork/profile.html @@ -55,13 +55,13 @@ address.

{{ email.email }} - {% ifnotequal user.email email.email %} + {% if user.email != email.email %}
{% csrf_token %}
- {% endifnotequal %} + {% endif %} {% if email.is_optout %}