Prechádzať zdrojové kódy

change todo to tickets

Evgeny Polivanov 1 rok pred
rodič
commit
859b8f793a

+ 1 - 1
.gitignore

@@ -2,7 +2,7 @@
 env/
 venv/
 #module
-todo/
+tickets/
 # VSCode
 .vscode
 

+ 2 - 2
SharixAdmin/templates/SharixAdmin/index.html

@@ -28,9 +28,9 @@
                       <span class="hidemenu">{{ item.title }}</span>
                     </a>
                   </li>
-                  {% elif item.link == 'todo' %}
+                  {% elif item.link == 'tickets' %}
                   <li class="nav-item">
-                    <a href="{% url 'todo:lists' %}" class="nav-link" >
+                    <a href="{% url 'tickets:lists' %}" class="nav-link" >
                       {% with 'SharixAdmin/img/menu/'|add:item.sel|add:'.svg' as image_static %}
                         <img  src="{% static image_static %}" alt="" style="width: 30px; height: 30px;"> 
                       {% endwith %}

+ 1 - 1
SharixAdmin/views.py

@@ -100,7 +100,7 @@ menu = [
     {'title':'Мои связи',               'link':'test-page', 'sel':'people'},
     {'title':'Сотрудничество',          'link':'test-page', 'sel':'sotrud'},
     {'title':'Техподдержка',            'link':'test-page', 'sel':'gear'},
-    {'title':'Мои заявки',              'link':'todo', 'sel':'tikets'},
+    {'title':'Мои заявки',              'link':'tickets', 'sel':'tikets'},
 ]
 
 def get_context(request, page_context) -> dict:

+ 1 - 1
core/api_settings.py

@@ -18,7 +18,7 @@ REST_FRAMEWORK = {
 
 SPAGHETTI_SAUCE = {
     'apps': ['auth', 'SharixAdmin', 
-             'todo', 'admin', 
+             'tickets', 'admin', 
              'flatpages', 'sessions', 'sites'],
     'show_fields': False,
     'show_proxy':True,

+ 3 - 3
core/settings.py

@@ -2,7 +2,7 @@ from pathlib import Path
 import os
 from core.db_settings import *
 from core.api_settings import *
-from core.todo_mail_settings import *
+from core.tickets_mail_settings import *
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -24,7 +24,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'SharixAdmin.apps.SharixadminConfig',
-    'todo.apps.TodoConfig',
+    'tickets.apps.ticketsConfig',
     'django_tables2',
     "django.contrib.sites",
     "django.contrib.flatpages",
@@ -75,7 +75,7 @@ TEMPLATES = [
                 "django.template.context_processors.tz",
             ],
             'libraries': {
-                'custom_tags':'todo.template_tags.custom_tags'
+                'custom_tags':'tickets.template_tags.custom_tags'
             }
         },
     },

+ 10 - 10
core/todo_mail_settings.py → core/tickets_mail_settings.py

@@ -1,20 +1,20 @@
-#LOGIN_REDIRECT_URL = "todo:lists"
+#LOGIN_REDIRECT_URL = "tickets:lists"
 #LOGIN_URL = "/accounts/login/"
 #LOGOUT_REDIRECT_URL = "/accounts/login/"
-# TODO-specific settings
-TODO_STAFF_ONLY = False
-TODO_DEFAULT_LIST_SLUG = 'tickets'
-TODO_DEFAULT_ASSIGNEE = None
-TODO_PUBLIC_SUBMIT_REDIRECT = '/'
+# tickets-specific settings
+TICKETS_STAFF_ONLY = False
+TICKETS_DEFAULT_LIST_SLUG = 'tickets'
+TICKETS_DEFAULT_ASSIGNEE = None
+TICKETS_PUBLIC_SUBMIT_REDIRECT = '/'
 
-from todo.mail.producers import imap_producer
-from todo.mail.consumers import tracker_consumer
-from todo.mail.delivery import smtp_backend, console_backend
+from tickets.mail.producers import imap_producer
+from tickets.mail.consumers import tracker_consumer
+from tickets.mail.delivery import smtp_backend, console_backend
 
 # email notifications configuration
 # each task list can get its own delivery method
 IS_SEND_EMAIL = False
-# TODO_MAIL_BACKENDS = {
+# TICKETS_MAIL_BACKENDS = {
 #     # mail-queue is the name of the task list, not the worker name
 #     "mail-queue": smtp_backend(
 #         host="*********",

+ 1 - 1
core/urls.py

@@ -9,7 +9,7 @@ urlpatterns = (
     [
     path('admin/', admin.site.urls),
     path('', include('SharixAdmin.urls')),
-    path('todo/', include("todo.urls"), name='todo'),
+    path('tickets/', include("tickets.urls"), name='tickets'),
    
 
 ] 

+ 1 - 1
install_linux.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-git clone -b tickets_module http://git.sharix-app.org/ShariX_Open/sharix-open-tickets.git todo
+git clone -b tickets_module http://git.sharix-app.org/ShariX_Open/sharix-open-tickets.git tickets
 
 python3 -m venv env
 

+ 1 - 1
install_win.bat

@@ -1,4 +1,4 @@
 @echo off
-git clone -b tickets_module http://git.sharix-app.org/ShariX_Open/sharix-open-tickets.git todo
+git clone -b tickets_module http://git.sharix-app.org/ShariX_Open/sharix-open-tickets.git tickets
 python -m venv env
 .\env\Scripts\activate && pip install -r requirements.txt && python manage.py makemigrations && python manage.py migrate && python manage.py createsuperuser && python manage.py runserver