mirror of https://github.com/jumpserver/jumpserver
parent
db22a68786
commit
7530afe368
|
@ -0,0 +1,17 @@
|
|||
# Generated by Django 3.2.16 on 2022-12-23 07:36
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('assets', '0116_alter_automationexecution_options'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name='gateway',
|
||||
options={'verbose_name': 'Gateway'},
|
||||
),
|
||||
]
|
|
@ -37,6 +37,7 @@ class Gateway(Host):
|
|||
|
||||
class Meta:
|
||||
proxy = True
|
||||
verbose_name = _("Gateway")
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
self.platform = self.default_platform()
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5c366d6b10c4ce62bd8ed7c69ecaec5533f1a178b3cc7db4e6008769a6c8bb1f
|
||||
size 119897
|
||||
oid sha256:7f83a00d90fe74749386ecd1f64d507b135e8c4d35acea1c5cd56bba3387e834
|
||||
size 119674
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eaeedc4823f9b7e236b36a169b5587ef5988d3c3e529d6cbede6bae5e2b57ab8
|
||||
size 106349
|
||||
oid sha256:b02c5d36ea6ea96590be9a25dc6d3f1340a5af2aa940764243f85da1c756c732
|
||||
size 104221
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,41 @@
|
|||
# Generated by Django 3.2.16 on 2022-12-23 07:36
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('ops', '0032_auto_20221221_1513'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name='adhoc',
|
||||
options={'verbose_name': 'AdHoc'},
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='celerytask',
|
||||
options={'ordering': ('name',), 'verbose_name': 'Celery Task'},
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='celerytaskexecution',
|
||||
options={'verbose_name': 'Celery Task Execution'},
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='historicaljob',
|
||||
options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical Job', 'verbose_name_plural': 'historical Jobs'},
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='job',
|
||||
options={'ordering': ['date_created'], 'verbose_name': 'Job'},
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='jobauditlog',
|
||||
options={'verbose_name': 'Job audit log'},
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='jobexecution',
|
||||
options={'ordering': ['-date_created'], 'verbose_name': 'Job Execution'},
|
||||
),
|
||||
]
|
|
@ -41,3 +41,6 @@ class AdHoc(JMSOrgBaseModel):
|
|||
|
||||
def __str__(self):
|
||||
return "{}: {}".format(self.module, self.args)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("AdHoc")
|
||||
|
|
|
@ -44,6 +44,7 @@ class CeleryTask(models.Model):
|
|||
return "green"
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Celery Task")
|
||||
ordering = ('name',)
|
||||
|
||||
|
||||
|
@ -77,3 +78,6 @@ class CeleryTaskExecution(models.Model):
|
|||
|
||||
def __str__(self):
|
||||
return "{}: {}".format(self.name, self.id)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Celery Task Execution")
|
||||
|
|
|
@ -88,6 +88,7 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
|
|||
return self.executions.create(job_version=self.version)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Job")
|
||||
ordering = ['date_created']
|
||||
|
||||
|
||||
|
@ -284,6 +285,7 @@ class JobExecution(JMSOrgBaseModel):
|
|||
self.set_error(e)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Job Execution")
|
||||
ordering = ['-date_created']
|
||||
|
||||
|
||||
|
@ -294,3 +296,4 @@ class JobAuditLog(JobExecution):
|
|||
|
||||
class Meta:
|
||||
proxy = True
|
||||
verbose_name = _("Job audit log")
|
||||
|
|
|
@ -52,8 +52,8 @@ extra_nodes_data = [
|
|||
{"id": "terminal_node", "name": _("Terminal setting"), "pId": "view_setting"},
|
||||
{'id': "task_center", "name": _("Task Center"), "pId": "view_console"},
|
||||
{'id': "my_assets", "name": _("My assets"), "pId": "view_workbench"},
|
||||
{'id': "operation_center", "name": _('Operation Center'), "pId": "view_workbench"},
|
||||
{'id': "remote_application", "name": _("Remote application"), "pId": "view_setting"},
|
||||
{'id': "operation_center", "name": _('App ops'), "pId": "view_workbench"},
|
||||
{'id': "remote_application", "name": _("Applet"), "pId": "view_setting"},
|
||||
]
|
||||
|
||||
# 将 model 放到其它节点下,而不是本来的 app 中
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
# Generated by Django 3.2.16 on 2022-12-23 07:36
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('terminal', '0064_auto_20221220_1956'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name='applet',
|
||||
options={'verbose_name': 'Applet'},
|
||||
),
|
||||
migrations.AlterModelOptions(
|
||||
name='applethost',
|
||||
options={'verbose_name': 'Applet host'},
|
||||
),
|
||||
]
|
|
@ -34,6 +34,9 @@ class Applet(JMSBaseModel):
|
|||
to='AppletHost', verbose_name=_('Hosts')
|
||||
)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Applet")
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
|
|
@ -29,6 +29,9 @@ class AppletHost(Host):
|
|||
)
|
||||
LOCKING_ORG = '00000000-0000-0000-0000-000000000004'
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Applet host")
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
# Generated by Django 3.2.16 on 2022-12-23 07:36
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('tickets', '0026_auto_20221220_1956'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='applycommandticket',
|
||||
name='apply_run_account',
|
||||
field=models.CharField(default='', max_length=128, verbose_name='Account'),
|
||||
),
|
||||
]
|
|
@ -10,7 +10,7 @@ class ApplyCommandTicket(Ticket):
|
|||
)
|
||||
apply_run_asset = models.CharField(max_length=128, verbose_name=_('Run asset'))
|
||||
apply_run_command = models.CharField(max_length=4096, verbose_name=_('Run command'))
|
||||
apply_run_account = models.CharField(max_length=128, default='', verbose_name=_('Run account'))
|
||||
apply_run_account = models.CharField(max_length=128, default='', verbose_name=_('Account'))
|
||||
apply_from_session = models.ForeignKey(
|
||||
'terminal.Session', on_delete=models.SET_NULL, null=True, verbose_name=_("Session")
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue