github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-20 02:51:27 +00:00
Code Issues Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ibuler
2020-10-29 19:16:32 +08:00
committed by Jiangjie.Bai
parent 5e7650d719
commit 4ebb4d1b6d
4 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/perms/migrations/0016_applicationpermission.py
View File

@@ -124,7 +124,10 @@ def migrate_and_integrate_application_permissions(apps, schema_editor):
for old_perm in old_perms:
if category == CATEGORY_REMOTE:
type_list = list(old_perm.remote_apps.values_list('type', flat=True))
_type = max(type_list, key=type_list.count)
if len(type_list) == 0:
_type = TYPE_REMOTE_CHROME
else:
_type = max(type_list, key=type_list.count)
else:
_type = data_json['type']
perm_json = old_perm_to_application_permission_json(old_perm, category, _type)