diff --git a/web/api/views.py b/web/api/views.py
index da7ae35a..cfcc84dc 100644
--- a/web/api/views.py
+++ b/web/api/views.py
@@ -52,6 +52,10 @@ class ListTargetsDatatableViewSet(viewsets.ModelViewSet):
serializer_class = DomainSerializer
def get_queryset(self):
+ slug = self.request.GET.get('slug', None)
+ if slug:
+ project = Project.objects.get(slug=slug)
+ self.queryset = self.queryset.filter(project=project)
return self.queryset
def filter_queryset(self, qs):
diff --git a/web/startScan/templates/startScan/schedule_scan_ui.html b/web/startScan/templates/startScan/schedule_scan_ui.html
index b8be8863..7b04470f 100644
--- a/web/startScan/templates/startScan/schedule_scan_ui.html
+++ b/web/startScan/templates/startScan/schedule_scan_ui.html
@@ -14,7 +14,7 @@ Schedule Scan
{% endblock custom_js_css_link %}
{% block breadcrumb_title %}
-
Target
+Target
Schedule Scan
{{domain.name}}
{% endblock breadcrumb_title %}
diff --git a/web/startScan/templates/startScan/start_multiple_scan_ui.html b/web/startScan/templates/startScan/start_multiple_scan_ui.html
index 8b6e8a83..1e379bc6 100644
--- a/web/startScan/templates/startScan/start_multiple_scan_ui.html
+++ b/web/startScan/templates/startScan/start_multiple_scan_ui.html
@@ -10,7 +10,7 @@ Start Scan
{% endblock custom_js_css_link %}
{% block breadcrumb_title %}
-Target
+Target
Initiate Multiple Scans
{% endblock breadcrumb_title %}
diff --git a/web/startScan/templates/startScan/start_scan_ui.html b/web/startScan/templates/startScan/start_scan_ui.html
index 5c4e072a..aca8687a 100644
--- a/web/startScan/templates/startScan/start_scan_ui.html
+++ b/web/startScan/templates/startScan/start_scan_ui.html
@@ -12,7 +12,7 @@ Start Scan
{% endblock custom_js_css_link %}
{% block breadcrumb_title %}
-Target
+Target
Initiate Scan
{{domain.name}}
{% endblock breadcrumb_title %}
diff --git a/web/targetApp/templates/target/add.html b/web/targetApp/templates/target/add.html
index 6e2998e6..971393d0 100644
--- a/web/targetApp/templates/target/add.html
+++ b/web/targetApp/templates/target/add.html
@@ -10,7 +10,7 @@ Add targets
{% endblock custom_js_css_link %}
{% block breadcrumb_title %}
-Targets
+Targets
Add Target
{% endblock breadcrumb_title %}
diff --git a/web/targetApp/templates/target/list.html b/web/targetApp/templates/target/list.html
index 811f3c78..db9a5f81 100644
--- a/web/targetApp/templates/target/list.html
+++ b/web/targetApp/templates/target/list.html
@@ -14,7 +14,7 @@ List all targets
{% endblock custom_js_css_link %}
{% block breadcrumb_title %}
-Targets
+Targets
All Targets
{% endblock breadcrumb_title %}
@@ -113,7 +113,7 @@ $(document).ready(function(){
"lengthMenu": [5, 10, 20, 30, 40, 50, 100, 500, 1000],
"pageLength": 20,
'serverSide': true,
- "ajax": '/api/listTargets/?format=datatables',
+ "ajax": '/api/listTargets/?format=datatables&slug={{request.resolver_match.kwargs.slug}}',
"order": [
[1, "desc"]
],
diff --git a/web/targetApp/templates/target/summary.html b/web/targetApp/templates/target/summary.html
index 162f57c1..64782e17 100644
--- a/web/targetApp/templates/target/summary.html
+++ b/web/targetApp/templates/target/summary.html
@@ -18,7 +18,7 @@ Target Summary for {{target.name}}
{% endblock custom_js_css_link %}
{% block breadcrumb_title %}
-Targets
+Targets
Target Summary
{{target.name}}
{% endblock breadcrumb_title %}
diff --git a/web/targetApp/templates/target/test.html b/web/targetApp/templates/target/test.html
index 99b94093..e20dc4f0 100644
--- a/web/targetApp/templates/target/test.html
+++ b/web/targetApp/templates/target/test.html
@@ -18,7 +18,7 @@ Target Summary for {{target.name}}
{% endblock custom_js_css_link %}
{% block breadcrumb_title %}
-Targets
+Targets
Target Summary
{{target.name}}
{% endblock breadcrumb_title %}
@@ -195,4 +195,4 @@ Target Summary
-{% endblock main_content %}
\ No newline at end of file
+{% endblock main_content %}
diff --git a/web/targetApp/urls.py b/web/targetApp/urls.py
index 6aa28cb6..80819707 100644
--- a/web/targetApp/urls.py
+++ b/web/targetApp/urls.py
@@ -24,7 +24,7 @@ urlpatterns = [
views.update_organization,
name='update_organization'),
path(
- 'list/target',
+ '/list/target',
views.list_target,
name='list_target'),
path(
diff --git a/web/targetApp/views.py b/web/targetApp/views.py
index 4e819fbd..4b1328ae 100644
--- a/web/targetApp/views.py
+++ b/web/targetApp/views.py
@@ -230,7 +230,8 @@ def add_target(request):
}
return render(request, 'target/add.html', context)
-def list_target(request):
+
+def list_target(request, slug):
context = {
'list_target_li': 'active',
'target_data_active': 'active'
diff --git a/web/templates/base/_items/top_nav.html b/web/templates/base/_items/top_nav.html
index a8c8feb6..77be4f18 100644
--- a/web/templates/base/_items/top_nav.html
+++ b/web/templates/base/_items/top_nav.html
@@ -12,7 +12,7 @@
-
+
Targets