diff --git a/apps/accounts/api/automations/gather_account.py b/apps/accounts/api/automations/gather_account.py index 540f378e0..df8cc6a43 100644 --- a/apps/accounts/api/automations/gather_account.py +++ b/apps/accounts/api/automations/gather_account.py @@ -56,7 +56,7 @@ class DiscoverAccountsExecutionViewSet(AutomationExecutionViewSet): if not asset_id: return Response(status=400, data={"asset_id": "This field is required."}) - get_object_or_404(Asset, pk=asset_id) + asset = get_object_or_404(Asset, pk=asset_id) execution = AutomationExecution() execution.snapshot = { "assets": [asset_id], @@ -64,7 +64,7 @@ class DiscoverAccountsExecutionViewSet(AutomationExecutionViewSet): "type": "gather_accounts", "is_sync_account": False, "check_risk": True, - "name": "Adhoc gather accounts: {}".format(asset_id), + "name": "Adhoc gather accounts: {}".format(asset.name), } execution.save() execution.start() diff --git a/apps/accounts/models/automations/base.py b/apps/accounts/models/automations/base.py index 19fa891e4..09c40fcc9 100644 --- a/apps/accounts/models/automations/base.py +++ b/apps/accounts/models/automations/base.py @@ -45,6 +45,9 @@ class AutomationExecution(AssetAutomationExecution): ('add_backupaccountexecution', _('Can add backup account execution')), ] + def __str__(self): + return '{}: {}'.format(self.snapshot.get('name', ''), self.id) + @property def manager(self): from accounts.automations.endpoint import ExecutionManager diff --git a/apps/accounts/templates/accounts/backup_account_report.html b/apps/accounts/templates/accounts/backup_account_report.html index dcd0e05b6..c0adffe27 100644 --- a/apps/accounts/templates/accounts/backup_account_report.html +++ b/apps/accounts/templates/accounts/backup_account_report.html @@ -14,6 +14,11 @@
+
+ {% trans 'Task name' %} + {{ execution.snapshot.name }} +
+
{% trans 'Date start' %} {{ execution.date_start | date:"Y/m/d H:i:s" }} @@ -29,11 +34,6 @@ {{ summary.total_accounts | default:0 }}
-
- {% trans 'Task name' %} - {{ execution.automation.name }} -
-
{% trans 'Time using' %} {{ execution.duration }}s diff --git a/apps/accounts/templates/accounts/change_secret_report.html b/apps/accounts/templates/accounts/change_secret_report.html index 5dd15cced..7b878334a 100644 --- a/apps/accounts/templates/accounts/change_secret_report.html +++ b/apps/accounts/templates/accounts/change_secret_report.html @@ -16,7 +16,7 @@
{% trans 'Task name' %} - {{ execution.automation.name }} + {{ execution.snapshot.name }}
diff --git a/apps/accounts/templates/accounts/gather_account_report.html b/apps/accounts/templates/accounts/gather_account_report.html index 440613e23..08bb6fda5 100644 --- a/apps/accounts/templates/accounts/gather_account_report.html +++ b/apps/accounts/templates/accounts/gather_account_report.html @@ -14,7 +14,7 @@
{% trans 'Task name' %} - {{ execution.automation.name }} + {{ execution.snapshot.name }}
diff --git a/apps/accounts/templates/accounts/push_account_report.html b/apps/accounts/templates/accounts/push_account_report.html index 7708f05b8..d1d63eeee 100644 --- a/apps/accounts/templates/accounts/push_account_report.html +++ b/apps/accounts/templates/accounts/push_account_report.html @@ -15,7 +15,7 @@
{% trans 'Task name' %} - {{ execution.automation.name }} + {{ execution.snapshot.name }}