diff --git a/fixtures/default_keywords.yaml b/fixtures/default_keywords.yaml index edd9fd97..ffd177cc 100644 --- a/fixtures/default_keywords.yaml +++ b/fixtures/default_keywords.yaml @@ -4,7 +4,9 @@ "pk": 1, "fields": { "keywords": "admin, ftp, cpanel, dashboard", - "custom_type": false + "custom_type": false, + "title_lookup": true, + "url_lookup": true } } ] diff --git a/scanEngine/forms.py b/scanEngine/forms.py index 61953afd..03c387be 100644 --- a/scanEngine/forms.py +++ b/scanEngine/forms.py @@ -193,6 +193,11 @@ class InterestingLookupForm(forms.ModelForm): })) def set_value(self, key): + print(key.url_lookup) self.initial['keywords'] = key.keywords self.initial['title_lookup'] = key.title_lookup self.initial['url_lookup'] = key.url_lookup + + def initial_checkbox(self): + self.initial['title_lookup'] = True + self.initial['url_lookup'] = True diff --git a/scanEngine/views.py b/scanEngine/views.py index da1f8127..776c292f 100644 --- a/scanEngine/views.py +++ b/scanEngine/views.py @@ -200,8 +200,10 @@ def interesting_lookup(request): context['scan_engine_nav_active'] = 'true' context['interesting_lookup_li'] = 'active' form = InterestingLookupForm() - if InterestingLookupModel.objects.filter(custom_type=True): + if InterestingLookupModel.objects.filter(custom_type=True).exists(): lookup_keywords = InterestingLookupModel.objects.filter(custom_type=True).order_by('-id')[0] + else: + form.initial_checkbox() if request.method == "POST": if lookup_keywords: form = InterestingLookupForm(request.POST, instance=lookup_keywords) @@ -216,6 +218,7 @@ def interesting_lookup(request): messages.INFO, 'Lookup Keywords updated successfully') return http.HttpResponseRedirect(reverse('interesting_lookup')) + if lookup_keywords: form.set_value(lookup_keywords) context['interesting_lookup_found'] = True