mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-12-16 17:12:53 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4cf81d96c | ||
|
|
a098bc6c06 | ||
|
|
86870ad985 | ||
|
|
c602bf7224 |
@@ -2,6 +2,7 @@ from django.db import models
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from accounts.const import AutomationTypes
|
from accounts.const import AutomationTypes
|
||||||
|
from jumpserver.utils import has_valid_xpack_license
|
||||||
from .base import AccountBaseAutomation
|
from .base import AccountBaseAutomation
|
||||||
from .change_secret import ChangeSecretMixin
|
from .change_secret import ChangeSecretMixin
|
||||||
|
|
||||||
@@ -27,6 +28,8 @@ class PushAccountAutomation(ChangeSecretMixin, AccountBaseAutomation):
|
|||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
self.type = AutomationTypes.push_account
|
self.type = AutomationTypes.push_account
|
||||||
|
if not has_valid_xpack_license():
|
||||||
|
self.is_periodic = False
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
def to_attr_json(self):
|
def to_attr_json(self):
|
||||||
|
|||||||
@@ -306,10 +306,11 @@ class AllTypes(ChoicesMixin):
|
|||||||
protocols_data = deepcopy(default_protocols)
|
protocols_data = deepcopy(default_protocols)
|
||||||
if _protocols:
|
if _protocols:
|
||||||
protocols_data = [p for p in protocols_data if p['name'] in _protocols]
|
protocols_data = [p for p in protocols_data if p['name'] in _protocols]
|
||||||
|
|
||||||
for p in protocols_data:
|
for p in protocols_data:
|
||||||
setting = _protocols_setting.get(p['name'], {})
|
setting = _protocols_setting.get(p['name'], {})
|
||||||
p['required'] = p.pop('required', False)
|
p['required'] = setting.pop('required', False)
|
||||||
p['default'] = p.pop('default', False)
|
p['default'] = setting.pop('default', False)
|
||||||
p['setting'] = {**p.get('setting', {}), **setting}
|
p['setting'] = {**p.get('setting', {}), **setting}
|
||||||
|
|
||||||
platform_data = {
|
platform_data = {
|
||||||
|
|||||||
Reference in New Issue
Block a user