github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: Solve the problem of version increase caused by push account

pull/14582/head
jiangweidong 2024-12-04 08:50:36 +08:00 committed by Bryan
parent 3267c8074b
commit d8dfaf0868
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/accounts/automations/change_secret/manager.py
View File

@ -180,7 +180,7 @@ class ChangeSecretManager(AccountBasePlaybookManager):
while retry_count < max_retries: while retry_count < max_retries:
try: try:
recorder.save() recorder.save()
account.save(update_fields=['secret', 'version', 'date_updated']) account.save(update_fields=['secret', 'date_updated'])
break break
except Exception as e: except Exception as e:
retry_count += 1 retry_count += 1

1
apps/accounts/models/mixins/vault.py
View File

@ -80,6 +80,7 @@ class VaultModelMixin(models.Model):
def mark_secret_save_to_vault(self): def mark_secret_save_to_vault(self):
self._secret = self._secret_save_to_vault_mark self._secret = self._secret_save_to_vault_mark
self.skip_history_when_saving = True
self.save() self.save()
@property @property

3
apps/accounts/signal_handlers.py
View File

@ -23,6 +23,9 @@ logger = get_logger(__name__)
@receiver(pre_save, sender=Account) @receiver(pre_save, sender=Account)
def on_account_pre_save(sender, instance, **kwargs): def on_account_pre_save(sender, instance, **kwargs):
if getattr(instance, 'skip_history_when_saving', False):
return
if instance.version == 0: if instance.version == 0:
instance.version = 1 instance.version = 1
else: else: