diff --git a/apps/accounts/automations/gather_account/manager.py b/apps/accounts/automations/gather_account/manager.py index cfdae0fc5..c5598d806 100644 --- a/apps/accounts/automations/gather_account/manager.py +++ b/apps/accounts/automations/gather_account/manager.py @@ -31,12 +31,12 @@ diff_items = risk_items + common_risk_items @bulk_create_decorator(AccountRisk) -def _create_risk(self, data): +def _create_risk(data): return AccountRisk(**data) @bulk_update_decorator(AccountRisk, update_fields=["details"]) -def _update_risk(self, account): +def _update_risk(account): return account diff --git a/apps/assets/automations/base/manager.py b/apps/assets/automations/base/manager.py index edb51d385..dbc390fe6 100644 --- a/apps/assets/automations/base/manager.py +++ b/apps/assets/automations/base/manager.py @@ -155,7 +155,7 @@ class BaseManager: report = self.gen_report() report = transform(report, cssutils_logging_level="CRITICAL") subject = self.get_report_subject() - emails = [r.email for r in recipients if r.email] + emails = [user.email] send_mail_async(subject, report, emails, html_message=report) def gen_report(self): diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 1d13aca7b..8d4cab7db 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -1385,9 +1385,9 @@ "TicketFlow": "Ticket flow", "TicketFlowCreate": "Create approval flow", "TicketFlowUpdate": "Update the approval flow", - "TicketList": "Ticket list", + "TicketList": "Tickets", "Tickets": "Tickets", - "TicketsAudit": "Tickets audit", + "TicketsAudit": "Ticket audits", "Time": "Time", "TimeDelta": "Duration", "TimeExpression": "Time expression", diff --git a/apps/tickets/migrations/0001_initial.py b/apps/tickets/migrations/0001_initial.py index 9db938f25..836bb6778 100644 --- a/apps/tickets/migrations/0001_initial.py +++ b/apps/tickets/migrations/0001_initial.py @@ -61,7 +61,7 @@ class Migration(migrations.Migration): ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)), ('title', models.CharField(max_length=256, verbose_name='Title')), ('type', models.CharField(choices=[('general', 'General'), ('apply_asset', 'Apply for asset'), ('login_confirm', 'Login confirm'), ('command_confirm', 'Command confirm'), ('login_asset_confirm', 'Login asset confirm')], default='general', max_length=64, verbose_name='Type')), - ('state', models.CharField(choices=[('pending', 'Open'), ('closed', 'Cancel'), ('approved', 'Approved'), ('rejected', 'Rejected')], default='pending', max_length=16, verbose_name='State')), + ('state', models.CharField(choices=[('all', 'All'), ('pending', 'Open'), ('closed', 'Cancel'), ('approved', 'Approved'), ('rejected', 'Rejected')], default='pending', max_length=16, verbose_name='State')), ('status', models.CharField(choices=[('open', 'Open'), ('closed', 'Finished')], default='open', max_length=16, verbose_name='Status')), ('approval_step', models.SmallIntegerField(choices=[(1, 'One level'), (2, 'Two level')], default=1, verbose_name='Approval step')), ('comment', models.TextField(blank=True, default='', verbose_name='Comment')), @@ -85,7 +85,7 @@ class Migration(migrations.Migration): ('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated')), ('comment', models.TextField(blank=True, default='', verbose_name='Comment')), ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)), - ('state', models.CharField(choices=[('pending', 'Open'), ('closed', 'Cancel'), ('approved', 'Approved'), ('rejected', 'Rejected')], default='pending', max_length=64)), + ('state', models.CharField(choices=[('all', 'All'), ('pending', 'Open'), ('closed', 'Cancel'), ('approved', 'Approved'), ('rejected', 'Rejected')], default='pending', max_length=64)), ], options={ 'verbose_name': 'Ticket assignee',