github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v3' into v3 

# Conflicts:
#	apps/tickets/migrations/0018_applyapplicationticket_apply_actions.py
#	apps/tickets/migrations/0018_auto_20220728_1125.py
pull/8873/head
ibuler 2022-08-30 14:09:42 +08:00
parent 8921dc9ac3 28541c48f7
commit b16e8ef1a5
3 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/tickets/migrations/0018_auto_20220728_1125.py
View File

@ -1,32 +0,0 @@
# Generated by Django 3.2.14 on 2022-07-28 03:25
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('tickets', '0017_auto_20220623_1027'),
]
operations = [
migrations.AddField(
model_name='applyapplicationticket',
name='apply_actions',
field=models.IntegerField(
choices=[
(255, 'All'), (1, 'Connect'), (2, 'Upload file'), (4, 'Download file'), (6, 'Upload download'),
(8, 'Clipboard copy'), (16, 'Clipboard paste'), (24, 'Clipboard copy paste')
], default=255,
verbose_name='Actions'),
),
migrations.AlterField(
model_name='applyapplicationticket',
name='apply_permission_name',
field=models.CharField(max_length=128, verbose_name='Permission name'),
),
migrations.AlterField(
model_name='applyassetticket',
name='apply_permission_name',
field=models.CharField(max_length=128, verbose_name='Permission name'),
),
]

2
apps/tickets/migrations/0019_delete_applyapplicationticket.py
View File

@ -6,7 +6,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('tickets', '0018_auto_20220728_1125'),
('tickets', '0018_applyapplicationticket_apply_actions'),
]
operations = [

10
apps/tickets/migrations/0020_auto_20220817_1346.py
View File

@ -50,6 +50,16 @@ class Migration(migrations.Migration):
]
operations = [
migrations.AlterField(
model_name='applyapplicationticket',
name='apply_permission_name',
field=models.CharField(max_length=128, verbose_name='Permission name'),
),
migrations.AlterField(
model_name='applyassetticket',
name='apply_permission_name',
field=models.CharField(max_length=128, verbose_name='Permission name'),
),
migrations.AddField(
model_name='applyassetticket',
name='apply_accounts',