List target with project fixed

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):

web/startScan/templates/startScan/schedule_scan_ui.html

@@ -14,7 +14,7 @@ Schedule Scan
 {% endblock custom_js_css_link %}
 
 {% block breadcrumb_title %}
-<li class="breadcrumb-item"><a href="{% url 'list_target' %}">Target</a></li>
+<li class="breadcrumb-item"><a href="{% url 'list_target' request.resolver_match.kwargs.slug %}">Target</a></li>
 <li class="breadcrumb-item active">Schedule Scan</li>
 <li class="breadcrumb-item active" aria-current="page">{{domain.name}}</li>
 {% endblock breadcrumb_title %}

web/startScan/templates/startScan/start_multiple_scan_ui.html

@@ -10,7 +10,7 @@ Start Scan
 {% endblock custom_js_css_link %}
 
 {% block breadcrumb_title %}
-<li class="breadcrumb-item"><a href="{% url 'list_target' %}">Target</a></li>
+<li class="breadcrumb-item"><a href="{% url 'list_target' request.resolver_match.kwargs.slug %}">Target</a></li>
 <li class="breadcrumb-item active">Initiate Multiple Scans</li>
 {% endblock breadcrumb_title %}
 

web/startScan/templates/startScan/start_scan_ui.html

@@ -12,7 +12,7 @@ Start Scan
 {% endblock custom_js_css_link %}
 
 {% block breadcrumb_title %}
-<li class="breadcrumb-item"><a href="{% url 'list_target' %}">Target</a></li>
+<li class="breadcrumb-item"><a href="{% url 'list_target' request.resolver_match.kwargs.slug %}">Target</a></li>
 <li class="breadcrumb-item active">Initiate Scan</li>
 <li class="breadcrumb-item active" aria-current="page">{{domain.name}}</li>
 {% endblock breadcrumb_title %}

web/targetApp/templates/target/add.html

@@ -10,7 +10,7 @@ Add targets
 {% endblock custom_js_css_link %}
 
 {% block breadcrumb_title %}
-<li class="breadcrumb-item"><a href="{% url 'list_target' %}">Targets</a></li>
+<li class="breadcrumb-item"><a href="{% url 'list_target' request.resolver_match.kwargs.slug %}">Targets</a></li>
 <li class="breadcrumb-item active">Add Target</li>
 {% endblock breadcrumb_title %}
 

web/targetApp/templates/target/list.html

@@ -14,7 +14,7 @@ List all targets
 {% endblock custom_js_css_link %}
 
 {% block breadcrumb_title %}
-<li class="breadcrumb-item active"><a href="{% url 'list_target' %}">Targets</a></li>
+<li class="breadcrumb-item active"><a href="{% url 'list_target' request.resolver_match.kwargs.slug %}">Targets</a></li>
 <li class="breadcrumb-item"><a href="#">All Targets</a></li>
 {% 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"]
 			],

web/targetApp/templates/target/summary.html

@@ -18,7 +18,7 @@ Target Summary for {{target.name}}
 {% endblock custom_js_css_link %}
 
 {% block breadcrumb_title %}
-<li class="breadcrumb-item"><a href="{% url 'list_target' %}">Targets</a></li>
+<li class="breadcrumb-item"><a href="{% url 'list_target' request.resolver_match.kwargs.slug %}">Targets</a></li>
 <li class="breadcrumb-item active">Target Summary</li>
 <li class="breadcrumb-item active" aria-current="page">{{target.name}}</li>
 {% endblock breadcrumb_title %}

web/targetApp/templates/target/test.html

@@ -18,7 +18,7 @@ Target Summary for {{target.name}}
 {% endblock custom_js_css_link %}
 
 {% block breadcrumb_title %}
-<li class="breadcrumb-item"><a href="{% url 'list_target' %}">Targets</a></li>
+<li class="breadcrumb-item"><a href="{% url 'list_target' request.resolver_match.kwargs.slug %}">Targets</a></li>
 <li class="breadcrumb-item active">Target Summary</li>
 <li class="breadcrumb-item active" aria-current="page">{{target.name}}</li>
 {% endblock breadcrumb_title %}
@@ -195,4 +195,4 @@ Target Summary
         </div>
     </div>
 </div>
-{% endblock main_content %}
+{% endblock main_content %}

web/targetApp/urls.py

@@ -24,7 +24,7 @@ urlpatterns = [
         views.update_organization,
         name='update_organization'),
     path(
-        'list/target',
+        '<slug:slug>/list/target',
         views.list_target,
         name='list_target'),
     path(

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'

web/templates/base/_items/top_nav.html

@@ -12,7 +12,7 @@
             </a>
           </li>
           <li class="nav-item dropdown {{target_data_active}}">
-            <a class="nav-link arrow-none" href="{% url 'list_target' %}">
+            <a class="nav-link arrow-none" href="{% url 'list_target' request.resolver_match.kwargs.slug %}">
               <i class="fe-crosshair me-1"></i> Targets
             </a>
           </li>