From 1339beb578395034ad7d81289954df85c2d50617 Mon Sep 17 00:00:00 2001
From: MOIS3Y <s.zhukovskii@ispsystem.com>
Date: Fri, 4 Aug 2023 11:53:53 +0900
Subject: [PATCH] Add: urlconf collector namespaces

---
 logs_collector/collector/models.py                        | 6 +++---
 .../collector/templates/collector/navigation.html         | 4 ++--
 logs_collector/collector/templates/collector/ticket.html  | 8 ++++----
 logs_collector/collector/urls.py                          | 2 +-
 logs_collector/collector/views.py                         | 2 +-
 logs_collector/logs_collector/urls.py                     | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/logs_collector/collector/models.py b/logs_collector/collector/models.py
index 8655c7a..5169387 100644
--- a/logs_collector/collector/models.py
+++ b/logs_collector/collector/models.py
@@ -56,7 +56,7 @@ class Archive(models.Model):
             super().save(*args, **kwargs)
 
     def get_absolute_url(self):
-        return reverse('download', kwargs={'path': self.file})
+        return reverse('collector:download', kwargs={'path': self.file})
 
     def __str__(self):
         return str(self.file)
@@ -67,7 +67,7 @@ class Platform(models.Model):
     pretty_name = models.CharField(max_length=20)
 
     def get_absolute_url(self):
-        return reverse('platform', kwargs={'platform': self.name})
+        return reverse('collector:platform', kwargs={'platform': self.name})
 
     def __str__(self):
         return self.name
@@ -87,7 +87,7 @@ class Ticket(models.Model):
 
     def get_absolute_url(self):
         return reverse(
-            'ticket',
+            'collector:ticket',
             kwargs={'platform': self.platform.name, 'ticket': self.number}
         )
 
diff --git a/logs_collector/collector/templates/collector/navigation.html b/logs_collector/collector/templates/collector/navigation.html
index 45fa4c0..e0a13ef 100644
--- a/logs_collector/collector/templates/collector/navigation.html
+++ b/logs_collector/collector/templates/collector/navigation.html
@@ -17,7 +17,7 @@
     </svg>
     <nav class="navbar navbar-expand-lg bg-body-tertiary">
       <div class="container">
-        <a class="navbar-brand" href="{% url 'index' %}">Logs Collector <i class="bi bi-file-earmark-zip-fill"></i></a>
+        <a class="navbar-brand" href="{% url 'collector:index' %}">Logs Collector <i class="bi bi-file-earmark-zip-fill"></i></a>
         <button
           class="navbar-toggler"
           type="button"
@@ -40,7 +40,7 @@
                 >Tickets</button>
               <ul class="dropdown-menu">
                 <li>
-                  <a class="dropdown-item" href="{% url 'index' %}">All</a>
+                  <a class="dropdown-item" href="{% url 'collector:index' %}">All</a>
                 </li>
                 {% for platform in platforms %}
                 <li>
diff --git a/logs_collector/collector/templates/collector/ticket.html b/logs_collector/collector/templates/collector/ticket.html
index 0138d0c..7da58ce 100644
--- a/logs_collector/collector/templates/collector/ticket.html
+++ b/logs_collector/collector/templates/collector/ticket.html
@@ -20,7 +20,7 @@
                 type="checkbox"
                 role="switch"
                 id="ticket-state"
-                ticket-state-url="{% url 'ajax_update_state_ticket' ticket.platform ticket.number %}"
+                ticket-state-url="{% url 'collector:ajax_update_state_ticket' ticket.platform ticket.number %}"
                 {% if ticket.resolved %} ticket-state-switch="1" {% endif %}
                 {% if ticket.resolved %} checked {% endif %}>
             </div>
@@ -126,7 +126,7 @@
               >Cancel
               </button>
               <a
-                href="{% url 'download' archive.file %}"
+                href="{% url 'collector:download' archive.file %}"
                 type="button"
                 class="btn btn-danger btn-archive-eraser"
                 data-bs-dismiss="modal"
@@ -157,10 +157,10 @@
                 >Cancel</button>
                 <a
                   type="button"
-                  href="{% url 'ajax_delete_ticket' ticket.number %}"
+                  href="{% url 'collector:ajax_delete_ticket' ticket.number %}"
                   class="btn btn-danger btn-ticket-del"
                   data-bs-dismiss="modal"
-                  data-jq-ticket-del-redirect="{% url 'tickets' %}"
+                  data-jq-ticket-del-redirect="{% url 'collector:tickets' %}"
                 >Delete</a>
             </div>
           </div>
diff --git a/logs_collector/collector/urls.py b/logs_collector/collector/urls.py
index 38b4784..d675415 100644
--- a/logs_collector/collector/urls.py
+++ b/logs_collector/collector/urls.py
@@ -2,7 +2,7 @@ from django.urls import path
 
 from . import views
 
-
+app_name = 'collector'
 urlpatterns = [
 
     # █░█░█ █▀▀ █▄▄
diff --git a/logs_collector/collector/views.py b/logs_collector/collector/views.py
index 4375e06..d12684c 100644
--- a/logs_collector/collector/views.py
+++ b/logs_collector/collector/views.py
@@ -44,7 +44,7 @@ class ListPlatformTickets(generic.ListView):
     model = Ticket
     template_name = 'collector/tickets.html'
     context_object_name = 'tickets'
-    allow_empty = False
+    # allow_empty = False
     paginate_by = 5
 
     def get_queryset(self):
diff --git a/logs_collector/logs_collector/urls.py b/logs_collector/logs_collector/urls.py
index dbc5b65..3a6aaa8 100644
--- a/logs_collector/logs_collector/urls.py
+++ b/logs_collector/logs_collector/urls.py
@@ -23,7 +23,7 @@ from logs_collector import settings
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('', include('collector.urls')),
+    path('', include('collector.urls', namespace='collector')),
 ]