From cb2b8bb70b6ace966bcc5312495d1363208e21eb Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 12 Jun 2023 16:37:12 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=94=BE=E8=A1=8C=E5=BF=AB=E6=8D=B7?= =?UTF-8?q?=E9=94=AE=20ctrl-c-v?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/acls/models/base.py | 5 ++++- .../extensions/disable_new_tab_window_menu/content_script.js | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/acls/models/base.py b/apps/acls/models/base.py index c92bf09e2..44c03d2a2 100644 --- a/apps/acls/models/base.py +++ b/apps/acls/models/base.py @@ -12,6 +12,8 @@ __all__ = [ 'BaseACL', 'UserBaseACL', 'UserAssetAccountBaseACL', ] +from orgs.utils import tmp_to_org + class ActionChoices(models.TextChoices): reject = 'reject', _('Reject') @@ -115,7 +117,8 @@ class UserAssetAccountBaseACL(OrgModelMixin, UserBaseACL): queryset = queryset.filter(q) if asset: org_id = asset.org_id - q = cls.assets.get_filter_q(asset) + with tmp_to_org(org_id): + q = cls.assets.get_filter_q(asset) queryset = queryset.filter(q) if account and not account_username: account_username = account.username diff --git a/apps/terminal/applets/chrome/extensions/disable_new_tab_window_menu/content_script.js b/apps/terminal/applets/chrome/extensions/disable_new_tab_window_menu/content_script.js index b09cb7531..0b6162430 100644 --- a/apps/terminal/applets/chrome/extensions/disable_new_tab_window_menu/content_script.js +++ b/apps/terminal/applets/chrome/extensions/disable_new_tab_window_menu/content_script.js @@ -40,9 +40,9 @@ document.addEventListener("contextmenu", function (event) { event.preventDefault(); }); -var AllowedKeys = ['P', 'F', 'p', 'f'] +var AllowedKeys = ['P', 'F', 'C', 'V'] window.addEventListener("keydown", function (e) { - if (e.key === "F12" || (e.ctrlKey && !AllowedKeys.includes(e.key))) { + if (e.key === "F12" || (e.ctrlKey && !AllowedKeys.includes(e.key.toUpperCase()))) { e.preventDefault(); e.stopPropagation(); console.log('Press key: ', e.ctrlKey ? 'Ctrl' : '', e.shiftKey ? ' Shift' : '', e.key)