From 2d7349d596b7d5d2da61c9d1d4afcf253598896d Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Tue, 15 Mar 2022 11:02:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BD=8Dconnect=5Fmyasset/myapp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/migrations/0026_auto_20220307_1500.py | 2 +- apps/perms/migrations/0027_auto_20220310_1802.py | 2 +- apps/perms/models/application_permission.py | 1 - apps/rbac/tree.py | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/perms/migrations/0026_auto_20220307_1500.py b/apps/perms/migrations/0026_auto_20220307_1500.py index efb4a1795..7429c6408 100644 --- a/apps/perms/migrations/0026_auto_20220307_1500.py +++ b/apps/perms/migrations/0026_auto_20220307_1500.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): ], options={ 'verbose_name': 'Permed asset', - 'permissions': [('view_myassets', 'Can view my assets'), ('connect_myassets', 'Can connect my assets'), ('view_userassets', 'Can view user assets'), ('view_usergroupassets', 'Can view usergroup assets')], + 'permissions': [('view_myassets', 'Can view my assets'), ('view_userassets', 'Can view user assets'), ('view_usergroupassets', 'Can view usergroup assets')], 'proxy': True, 'indexes': [], 'constraints': [], diff --git a/apps/perms/migrations/0027_auto_20220310_1802.py b/apps/perms/migrations/0027_auto_20220310_1802.py index b4446f82a..542785345 100644 --- a/apps/perms/migrations/0027_auto_20220310_1802.py +++ b/apps/perms/migrations/0027_auto_20220310_1802.py @@ -17,7 +17,7 @@ class Migration(migrations.Migration): ], options={ 'verbose_name': 'Permed application', - 'permissions': [('view_myapps', 'Can view my apps'), ('connect_myapps', 'Can connect my apps'), ('view_userapps', 'Can view user apps'), ('view_usergroupapps', 'Can view usergroup apps')], + 'permissions': [('view_myapps', 'Can view my apps'), ('view_userapps', 'Can view user apps'), ('view_usergroupapps', 'Can view usergroup apps')], 'proxy': True, 'default_permissions': [], 'indexes': [], diff --git a/apps/perms/models/application_permission.py b/apps/perms/models/application_permission.py index 6cf5e33d7..d5d02faee 100644 --- a/apps/perms/models/application_permission.py +++ b/apps/perms/models/application_permission.py @@ -113,7 +113,6 @@ class PermedApplication(Application): default_permissions = [] permissions = [ ('view_myapps', 'Can view my apps'), - ('connect_myapps', 'Can connect my apps'), ('view_userapps', _('Can view user apps')), ('view_usergroupapps', _('Can view usergroup apps')), ] diff --git a/apps/rbac/tree.py b/apps/rbac/tree.py index eec2e627a..092f6ce90 100644 --- a/apps/rbac/tree.py +++ b/apps/rbac/tree.py @@ -87,9 +87,7 @@ special_pid_mapper = { 'audits.ftplog': 'terminal', 'rbac.menupermission': 'view_other', 'perms.view_myassets': 'my_assets', - 'perms.connect_myassets': 'my_assets', 'perms.view_myapps': 'my_apps', - 'perms.connect_myapps': 'my_apps', 'ops.add_commandexecution': 'view_workspace', 'ops.view_commandexecution': 'audits', "perms.view_mykubernetsapp": "my_apps",