Add: urlconf collector namespaces

This commit is contained in:
Stepan Zhukovsky 2023-08-04 11:53:53 +09:00
parent d4feebb3b0
commit 1339beb578
6 changed files with 12 additions and 12 deletions

View File

@ -56,7 +56,7 @@ class Archive(models.Model):
super().save(*args, **kwargs) super().save(*args, **kwargs)
def get_absolute_url(self): def get_absolute_url(self):
return reverse('download', kwargs={'path': self.file}) return reverse('collector:download', kwargs={'path': self.file})
def __str__(self): def __str__(self):
return str(self.file) return str(self.file)
@ -67,7 +67,7 @@ class Platform(models.Model):
pretty_name = models.CharField(max_length=20) pretty_name = models.CharField(max_length=20)
def get_absolute_url(self): def get_absolute_url(self):
return reverse('platform', kwargs={'platform': self.name}) return reverse('collector:platform', kwargs={'platform': self.name})
def __str__(self): def __str__(self):
return self.name return self.name
@ -87,7 +87,7 @@ class Ticket(models.Model):
def get_absolute_url(self): def get_absolute_url(self):
return reverse( return reverse(
'ticket', 'collector:ticket',
kwargs={'platform': self.platform.name, 'ticket': self.number} kwargs={'platform': self.platform.name, 'ticket': self.number}
) )

View File

@ -17,7 +17,7 @@
</svg> </svg>
<nav class="navbar navbar-expand-lg bg-body-tertiary"> <nav class="navbar navbar-expand-lg bg-body-tertiary">
<div class="container"> <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 <button
class="navbar-toggler" class="navbar-toggler"
type="button" type="button"
@ -40,7 +40,7 @@
>Tickets</button> >Tickets</button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a class="dropdown-item" href="{% url 'index' %}">All</a> <a class="dropdown-item" href="{% url 'collector:index' %}">All</a>
</li> </li>
{% for platform in platforms %} {% for platform in platforms %}
<li> <li>

View File

@ -20,7 +20,7 @@
type="checkbox" type="checkbox"
role="switch" role="switch"
id="ticket-state" 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 %} ticket-state-switch="1" {% endif %}
{% if ticket.resolved %} checked {% endif %}> {% if ticket.resolved %} checked {% endif %}>
</div> </div>
@ -126,7 +126,7 @@
>Cancel >Cancel
</button> </button>
<a <a
href="{% url 'download' archive.file %}" href="{% url 'collector:download' archive.file %}"
type="button" type="button"
class="btn btn-danger btn-archive-eraser" class="btn btn-danger btn-archive-eraser"
data-bs-dismiss="modal" data-bs-dismiss="modal"
@ -157,10 +157,10 @@
>Cancel</button> >Cancel</button>
<a <a
type="button" type="button"
href="{% url 'ajax_delete_ticket' ticket.number %}" href="{% url 'collector:ajax_delete_ticket' ticket.number %}"
class="btn btn-danger btn-ticket-del" class="btn btn-danger btn-ticket-del"
data-bs-dismiss="modal" data-bs-dismiss="modal"
data-jq-ticket-del-redirect="{% url 'tickets' %}" data-jq-ticket-del-redirect="{% url 'collector:tickets' %}"
>Delete</a> >Delete</a>
</div> </div>
</div> </div>

View File

@ -2,7 +2,7 @@ from django.urls import path
from . import views from . import views
app_name = 'collector'
urlpatterns = [ urlpatterns = [
# █░█░█ █▀▀ █▄▄ # █░█░█ █▀▀ █▄▄

View File

@ -44,7 +44,7 @@ class ListPlatformTickets(generic.ListView):
model = Ticket model = Ticket
template_name = 'collector/tickets.html' template_name = 'collector/tickets.html'
context_object_name = 'tickets' context_object_name = 'tickets'
allow_empty = False # allow_empty = False
paginate_by = 5 paginate_by = 5
def get_queryset(self): def get_queryset(self):

View File

@ -23,7 +23,7 @@ from logs_collector import settings
urlpatterns = [ urlpatterns = [
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path('', include('collector.urls')), path('', include('collector.urls', namespace='collector')),
] ]