openstack/watcher-dashboard
Code Issues Proposed changes

Set interval parameter to optional and add validation before audit create

Browse Source 
This patch fixes dashboard bug: Oneshot Audit Create failed

Change-Id: Ic3f8833a5091226abb22b8260cdc5adf8711c279
Closes-Bug: #1783683
This commit is contained in:
Yumeng Bao 2018-07-26 14:02:20 +08:00
parent f0f6cef879
commit ec4aea5aaa
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
watcher_dashboard/content/audits/forms.py
View File

@ -51,7 +51,8 @@ class CreateForm(forms.SelfHandlingForm):
'data-switch-on': 'audit_type', 'data-switch-on': 'audit_type',
'data-audit_type-continuous': 'data-audit_type-continuous':
_("Interval (in seconds or cron" _("Interval (in seconds or cron"
" format)")})) " format)")}),
required=False)
failure_url = 'horizon:admin:audits:index' failure_url = 'horizon:admin:audits:index'
auto_trigger = forms.BooleanField(label=_("Auto Trigger"), auto_trigger = forms.BooleanField(label=_("Auto Trigger"),
required=False) required=False)
@ -81,6 +82,14 @@ class CreateForm(forms.SelfHandlingForm):
choices.insert(0, ("", _("No Audit Template found"))) choices.insert(0, ("", _("No Audit Template found")))
return choices return choices
def clean(self):
cleaned_data = super(CreateForm, self).clean()
audit_type = cleaned_data.get('audit_type')
if audit_type == 'continuous' and not cleaned_data.get('interval'):
msg = _('Please input an interval for continuous audit')
raise forms.ValidationError(msg)
return cleaned_data
def handle(self, request, data): def handle(self, request, data):
try: try:
params = {'audit_template_uuid': data.get('audit_template')} params = {'audit_template_uuid': data.get('audit_template')}