mirror of https://github.com/jumpserver/jumpserver
feat: 增加comment 字段
parent
d741f14342
commit
82a8118ca0
|
@ -0,0 +1,23 @@
|
||||||
|
# Generated by Django 3.2.14 on 2022-11-29 11:52
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('ops', '0040_merge_0036_auto_20221128_1839_0039_auto_20221129_1932'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='adhoc',
|
||||||
|
name='comment',
|
||||||
|
field=models.CharField(blank=True, default='', max_length=1024, null=True, verbose_name='Comment'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='playbook',
|
||||||
|
name='comment',
|
||||||
|
field=models.CharField(blank=True, default='', max_length=1024, null=True, verbose_name='Comment'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -24,6 +24,8 @@ class AdHoc(JMSOrgBaseModel):
|
||||||
verbose_name=_('Module'))
|
verbose_name=_('Module'))
|
||||||
args = models.CharField(max_length=1024, default='', verbose_name=_('Args'))
|
args = models.CharField(max_length=1024, default='', verbose_name=_('Args'))
|
||||||
creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
|
creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
|
||||||
|
comment = models.CharField(max_length=1024, default='', verbose_name=_('Comment'), null=True, blank=True)
|
||||||
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def row_count(self):
|
def row_count(self):
|
||||||
|
|
|
@ -13,6 +13,7 @@ class Playbook(JMSOrgBaseModel):
|
||||||
name = models.CharField(max_length=128, verbose_name=_('Name'), null=True)
|
name = models.CharField(max_length=128, verbose_name=_('Name'), null=True)
|
||||||
path = models.FileField(upload_to='playbooks/')
|
path = models.FileField(upload_to='playbooks/')
|
||||||
creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
|
creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
|
||||||
|
comment = models.CharField(max_length=1024, default='', verbose_name=_('Comment'), null=True, blank=True)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def work_path(self):
|
def work_path(self):
|
||||||
|
|
|
@ -17,4 +17,5 @@ class AdHocSerializer(BulkOrgResourceModelSerializer, serializers.ModelSerialize
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = AdHoc
|
model = AdHoc
|
||||||
fields = ["id", "name", "module", "row_count", "size", "args", "creator", "date_created", "date_updated"]
|
fields = ["id", "name", "module", "row_count", "size", "args", "creator", "comment", "date_created",
|
||||||
|
"date_updated"]
|
||||||
|
|
|
@ -25,5 +25,5 @@ class PlaybookSerializer(BulkOrgResourceModelSerializer, serializers.ModelSerial
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Playbook
|
model = Playbook
|
||||||
fields = [
|
fields = [
|
||||||
"id", "name", "path", "date_created", "owner", "date_updated"
|
"id", "name", "path", "comment", "date_created", "creator", "date_updated"
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue