diff --git a/startScan/templates/startScan/detail_scan.html b/startScan/templates/startScan/detail_scan.html index b1d520b1..9b35259c 100644 --- a/startScan/templates/startScan/detail_scan.html +++ b/startScan/templates/startScan/detail_scan.html @@ -26,15 +26,15 @@ Scan history {% if scan_history.scan_status == 0 %} Failed {% elif scan_history.scan_status == 1 %} -
Scanning
-
-
-
+
Scanning
+
+
+
{% elif scan_history.scan_status == 2 %} -
Scanning
-
-
-
+
Scanning
+
+
+
{% else %}
Scanning
@@ -132,47 +132,48 @@ Scan history
-
+ - - {% endfor %} - - - + + + {% endfor %} + + - {% endblock main_content %} + + {% endblock main_content %} - {% block page_level_script %} - - - - - - {% endblock page_level_script %}.http_status + {% block page_level_script %} + + + + + + {% endblock page_level_script %}.http_status diff --git a/startScan/views.py b/startScan/views.py index 3458f338..8f21f831 100644 --- a/startScan/views.py +++ b/startScan/views.py @@ -94,7 +94,9 @@ def doScan(id, domain): subdomain_proto = ScannedSubdomainWithProtocols() subdomain_proto.host = sub subdomain_proto.url = data['pages'][host]['url'] - subdomain_proto.ip_address = data['pages'][host]['addrs'] + list_ip = data['pages'][host]['addrs'] + ip_string = ','.join(list_ip) + subdomain_proto.ip_address = ip_string subdomain_proto.page_title = data['pages'][host]['pageTitle'] subdomain_proto.http_status = data['pages'][host]['status'][0:3] subdomain_proto.screenshot_path = current_scan_dir + '/aquascreenshots/' + data['pages'][host]['screenshotPath']