mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-25 14:50:24 +00:00
perf: 授权分类采用from_ticket字段
This commit is contained in:
@@ -2,8 +2,3 @@
|
||||
#
|
||||
from django.db.models import TextChoices
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
|
||||
class AuthorizationRules(TextChoices):
|
||||
manual = 'manual', _('Manual authorization')
|
||||
ticket = 'ticket', _('Ticket authorization')
|
||||
|
@@ -1,23 +0,0 @@
|
||||
# Generated by Django 3.1.12 on 2021-08-31 03:50
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('perms', '0018_auto_20210208_1515'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='applicationpermission',
|
||||
name='authorization_rules',
|
||||
field=models.CharField(choices=[('manual', 'Manual authorization'), ('ticket', 'Ticket authorization')], default='manual', max_length=64, verbose_name='Authorization rules'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='assetpermission',
|
||||
name='authorization_rules',
|
||||
field=models.CharField(choices=[('manual', 'Manual authorization'), ('ticket', 'Ticket authorization')], default='manual', max_length=64, verbose_name='Authorization rules'),
|
||||
),
|
||||
]
|
23
apps/perms/migrations/0019_auto_20210906_1044.py
Normal file
23
apps/perms/migrations/0019_auto_20210906_1044.py
Normal file
@@ -0,0 +1,23 @@
|
||||
# Generated by Django 3.1.12 on 2021-09-06 02:44
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('perms', '0018_auto_20210208_1515'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='applicationpermission',
|
||||
name='from_ticket',
|
||||
field=models.BooleanField(default=False, verbose_name='From ticket'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='assetpermission',
|
||||
name='from_ticket',
|
||||
field=models.BooleanField(default=False, verbose_name='From ticket'),
|
||||
),
|
||||
]
|
@@ -11,7 +11,6 @@ from orgs.mixins.models import OrgModelMixin
|
||||
from common.db.models import UnionQuerySet
|
||||
from common.utils import date_expired_default, lazyproperty
|
||||
from orgs.mixins.models import OrgManager
|
||||
from ..const import AuthorizationRules
|
||||
|
||||
__all__ = [
|
||||
'BasePermission', 'BasePermissionQuerySet'
|
||||
@@ -52,9 +51,7 @@ class BasePermission(OrgModelMixin):
|
||||
created_by = models.CharField(max_length=128, blank=True, verbose_name=_('Created by'))
|
||||
date_created = models.DateTimeField(auto_now_add=True, verbose_name=_('Date created'))
|
||||
comment = models.TextField(verbose_name=_('Comment'), blank=True)
|
||||
authorization_rules = models.CharField(
|
||||
max_length=64, default=AuthorizationRules.manual, choices=AuthorizationRules.choices,
|
||||
verbose_name=_('Authorization rules'))
|
||||
from_ticket = models.BooleanField(default=False, verbose_name=_('From ticket'))
|
||||
|
||||
objects = BasePermissionManager.from_queryset(BasePermissionQuerySet)()
|
||||
|
||||
|
Reference in New Issue
Block a user