github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-29 21:51:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge v4 to dev

Browse Source
This commit is contained in:
Bai
2024-06-24 15:43:40 +08:00
parent 165d030c8e 8bfbebf29e
commit dfde50c768
741 changed files with 27595 additions and 34433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ops/models/adhoc.py
View File

@@ -8,7 +8,7 @@ from common.utils import get_logger
__all__ = ["AdHoc"]
from ops.const import AdHocModules
from ops.const import AdHocModules
from orgs.mixins.models import JMSOrgBaseModel

8
apps/ops/models/base.py
View File

@@ -1,11 +1,11 @@
import logging
import os.path
import uuid
import logging
from django.db import models
from django.utils.translation import gettext_lazy as _
from django.utils import timezone
from django.conf import settings
from django.db import models
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from orgs.mixins.models import JMSOrgBaseModel
from ..ansible.inventory import JMSInventory

6
apps/ops/models/job.py
View File

@@ -144,7 +144,7 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
args = models.CharField(max_length=8192, default='', verbose_name=_('Args'), null=True, blank=True)
module = models.CharField(max_length=128, choices=JobModules.choices, default=JobModules.shell,
verbose_name=_('Module'), null=True)
chdir = models.CharField(default="", max_length=1024, verbose_name=_('Chdir'), null=True, blank=True)
chdir = models.CharField(default="", max_length=1024, verbose_name=_('Run dir'), null=True, blank=True)
timeout = models.IntegerField(default=-1, verbose_name=_('Timeout (Seconds)'))
playbook = models.ForeignKey('ops.Playbook', verbose_name=_("Playbook"), null=True, on_delete=models.SET_NULL)
type = models.CharField(max_length=128, choices=Types.choices, default=Types.adhoc, verbose_name=_("Type"))
@@ -152,9 +152,9 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
assets = models.ManyToManyField('assets.Asset', verbose_name=_("Assets"))
use_parameter_define = models.BooleanField(default=False, verbose_name=(_('Use Parameter Define')))
parameters_define = models.JSONField(default=dict, verbose_name=_('Parameters define'))
runas = models.CharField(max_length=128, default='root', verbose_name=_('Runas'))
runas = models.CharField(max_length=128, default='root', verbose_name=_('Run as'))
runas_policy = models.CharField(max_length=128, choices=RunasPolicies.choices, default=RunasPolicies.skip,
verbose_name=_('Runas policy'))
verbose_name=_('Run as policy'))
comment = models.CharField(max_length=1024, default='', verbose_name=_('Comment'), null=True, blank=True)
version = models.IntegerField(default=0)
history = HistoricalRecords()

1
apps/ops/models/playbook.py
View File

@@ -85,4 +85,5 @@ class Playbook(JMSOrgBaseModel):
class Meta:
unique_together = [('name', 'org_id', 'creator')]
verbose_name = _("Playbook")
ordering = ['date_created']