mirror of https://github.com/jumpserver/jumpserver
fix: Gather account error
parent
613715135b
commit
c0adc1fe74
|
@ -31,12 +31,12 @@ diff_items = risk_items + common_risk_items
|
||||||
|
|
||||||
|
|
||||||
@bulk_create_decorator(AccountRisk)
|
@bulk_create_decorator(AccountRisk)
|
||||||
def _create_risk(self, data):
|
def _create_risk(data):
|
||||||
return AccountRisk(**data)
|
return AccountRisk(**data)
|
||||||
|
|
||||||
|
|
||||||
@bulk_update_decorator(AccountRisk, update_fields=["details"])
|
@bulk_update_decorator(AccountRisk, update_fields=["details"])
|
||||||
def _update_risk(self, account):
|
def _update_risk(account):
|
||||||
return account
|
return account
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -155,7 +155,7 @@ class BaseManager:
|
||||||
report = self.gen_report()
|
report = self.gen_report()
|
||||||
report = transform(report, cssutils_logging_level="CRITICAL")
|
report = transform(report, cssutils_logging_level="CRITICAL")
|
||||||
subject = self.get_report_subject()
|
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)
|
send_mail_async(subject, report, emails, html_message=report)
|
||||||
|
|
||||||
def gen_report(self):
|
def gen_report(self):
|
||||||
|
|
|
@ -1385,9 +1385,9 @@
|
||||||
"TicketFlow": "Ticket flow",
|
"TicketFlow": "Ticket flow",
|
||||||
"TicketFlowCreate": "Create approval flow",
|
"TicketFlowCreate": "Create approval flow",
|
||||||
"TicketFlowUpdate": "Update the approval flow",
|
"TicketFlowUpdate": "Update the approval flow",
|
||||||
"TicketList": "Ticket list",
|
"TicketList": "Tickets",
|
||||||
"Tickets": "Tickets",
|
"Tickets": "Tickets",
|
||||||
"TicketsAudit": "Tickets audit",
|
"TicketsAudit": "Ticket audits",
|
||||||
"Time": "Time",
|
"Time": "Time",
|
||||||
"TimeDelta": "Duration",
|
"TimeDelta": "Duration",
|
||||||
"TimeExpression": "Time expression",
|
"TimeExpression": "Time expression",
|
||||||
|
|
|
@ -61,7 +61,7 @@ class Migration(migrations.Migration):
|
||||||
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
||||||
('title', models.CharField(max_length=256, verbose_name='Title')),
|
('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')),
|
('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')),
|
('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')),
|
('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')),
|
('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')),
|
('date_updated', models.DateTimeField(auto_now=True, verbose_name='Date updated')),
|
||||||
('comment', models.TextField(blank=True, default='', verbose_name='Comment')),
|
('comment', models.TextField(blank=True, default='', verbose_name='Comment')),
|
||||||
('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
|
('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={
|
options={
|
||||||
'verbose_name': 'Ticket assignee',
|
'verbose_name': 'Ticket assignee',
|
||||||
|
|
Loading…
Reference in New Issue