From patchwork Thu May 20 15:47:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1481773 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=Ou0askAS; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ZTCDRVS5; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FmDhM6F0zz9sVt for ; Fri, 21 May 2021 01:49:55 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=yKNLkFh+vMDUPFk4/j4yQIspnCHWEHvzrGCvNjCxDUE=; b=Ou0askASd/Mo/rUquqXgqomff0 BksFKLw/WO5qhrbor6sbA9ug+1BW7KmvlhYoa9peycEyaapx4v+Xi4HkpcpfOe5yebz7gZ/+W4pPr HLNBzTHOwUZSYE8whYYv1RUt7J5srovJPtfn7H+uGlYBMHfY24fdseEAqWsKa/tVdlr7b3JxUaHgL u3ZyP7I8NUxTp6wX9UBk/o/FNu0ZGJIfw2hAaRPzt7klTzblsHqB1U9e/q74iiNjy7NsXolrppdqj NxIMJYr5V7ZbR9fQM/R0pkmQhLRYTy3wCuMED6iJjPuNOyV304mE3IURUN4njBzNFAsXvuIgDNcvW VHe8K23g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljktn-001lNJ-MG; Thu, 20 May 2021 15:47:47 +0000 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljkth-001lLk-Jw for openwrt-devel@lists.openwrt.org; Thu, 20 May 2021 15:47:45 +0000 Received: by mail-lj1-x236.google.com with SMTP id a4so5529412ljd.5 for ; Thu, 20 May 2021 08:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nRggu8VJ197EpJB5Y5929yXbi/TyHJlEqKOpVbTwlp4=; b=ZTCDRVS5Fc8OoEyQO9FOktSwXYuOTd2IIM4FujlMv+BZRd8q1OmeLEP8DgkOM+KN5F RmeqME52YwmpotEAYazBk4dIXdmrDrz0wmGyzi02D7IBiX/0DFDRBtD9tvV0wnPmmfch YFJLk0i9zvyMWXlqH7xZOAIXB2x68/GUc3yHy+Zit5AeR2eXsXrQj5wktOTJgAdfPMh3 MiAPimFJvIshoJIMhNh9CdTN+6z7vFf7MteC0I72JGRJvwGO0evXN3Hlp4QHQU5ke1Oe 00trsekR75zcHoT15gJ3WbdeHimU6EnNqazVv6rtbbrHY3n9pr4oUMmsQrsfz5SbEbfq NLEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nRggu8VJ197EpJB5Y5929yXbi/TyHJlEqKOpVbTwlp4=; b=uGoR/sj1X3uYSpaDZnM0CvEcXzVGegHvkhD1PbyvsCN798MWdC//w1lQXtuyOJCP+S bQTuORN6ZErkxp/99V5BluPxXygjf4Rq6jwcCupZ6UxmjltiAzpN+Pq8k/iPNx294HCN +E2goPgxhjBn3OwTslpEhVv3RyPLly6FjbH0H5/YlpPLiOyEAST27/OQdqAzoy++e0E6 uzkq33tn3nN3cyK8uug103auJrAx3jYRdz0nXfLpSIdATBpTvQ2uKJZIcbf177ufpddu 53ITmgD95Wb72kRCrj71tA96vEriu5BqZAFilnbYypoUzpWRtJAvc+HQzZGGSY7/kf7X dh3g== X-Gm-Message-State: AOAM532p6I0ISsmhCcJkAoycVkSSVODiYngpDRsYe1mNQyxkG5Sjghth /ZqOSdA9y/Ugr8EpkoOdR68= X-Google-Smtp-Source: ABdhPJx3dAWBe+m2HR/vTeXTanLvPtp6nI8DsuMGFJFvhtz4O7YVdtJj5KmZfb7vcBL9Au0VzxWjzg== X-Received: by 2002:a05:651c:3cc:: with SMTP id f12mr2080997ljp.364.1621525659935; Thu, 20 May 2021 08:47:39 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id u13sm336199lfg.132.2021.05.20.08.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 08:47:39 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Jo-Philipp Wich , openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH luci] luci-mod-network: hide aliases when selecting device for an interface Date: Thu, 20 May 2021 17:47:33 +0200 Message-Id: <20210520154733.24920-1-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210520_164743_313982_4FE3AD57 X-CRM114-Status: UNSURE ( 9.91 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22desiato=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_Now_th?= =?unknown-8bit?q?at_every_bridge_is_guaranteed?= =?unknown-8bit?q?_to_be_defined_as_a_standalone_device_there_is_no_need_for_?= =?unknown-8bit?q?aliases_there_anymore=2E?= =?unknown-8bit?q?_Signed-off-by=3A_Rafa=C5=82_Mi=C5=82ecki_---_=2E=2E=2E/htd?= =?unknown-8bit?q?ocs/luci-static/resources/view/network/interfaces=2Ejs?= =?unknown-8bit?q?_=7C_5_++---_1_file_changed=2C_2_insertions=28+=29=2C_3_del?= =?unknown-8bit?q?etions=28-=29_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E1_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDoyMzYgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends?= =?unknown-8bit?q?_in_digit?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki Now that every bridge is guaranteed to be defined as a standalone device there is no need for aliases there anymore. Signed-off-by: Rafał Miłecki --- .../htdocs/luci-static/resources/view/network/interfaces.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js index a1def24b07..7a5e438d7c 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js @@ -465,8 +465,7 @@ return view.extend({ o.write = function() {}; o = s.taboption('general', widgets.DeviceSelect, 'ifname', _('Device')); - o.nobridges = false; - o.noaliases = false; + o.noaliases = true; o.optional = false; o.network = ifc.getName(); @@ -925,7 +924,7 @@ return view.extend({ }; ifname = s2.option(widgets.DeviceSelect, 'ifname', _('Device')); - ifname.noaliases = false; + ifname.noaliases = true; ifname.optional = false; proto = s2.option(form.ListValue, 'proto', _('Protocol'));