Evgeny Polivanov преди 1 година
родител
ревизия
994f515279
променени са 5 файла, в които са добавени 6 реда и са изтрити 1 реда
  1. 1 0
      .gitignore
  2. 1 1
      SharixAdmin/views.py
  3. 1 0
      core/settings.py
  4. 2 0
      install_linux.sh
  5. 1 0
      install_win.bat

+ 1 - 0
.gitignore

@@ -3,6 +3,7 @@ env/
 venv/
 #module
 tickets/
+metaservicesynced/
 # VSCode
 .vscode
 

+ 1 - 1
SharixAdmin/views.py

@@ -6,7 +6,7 @@ from django.contrib.auth.views import LoginView
 from django.urls import reverse_lazy, resolve, reverse
 from django.contrib.auth.decorators import login_required
 from .forms import *
-from .models import *
+from SharixAdmin.models import *
 from django.contrib.auth import logout
 from django.db.models import Q
 from .tables import *

+ 1 - 0
core/settings.py

@@ -27,6 +27,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'SharixAdmin.apps.SharixadminConfig',
     'tickets.apps.ticketsConfig',
+    'metaservicesynced.apps.MetaservicesyncedConfig'
     'django_tables2',
     "django.contrib.sites",
     "django.contrib.flatpages",

+ 2 - 0
install_linux.sh

@@ -2,6 +2,8 @@
 
 git clone -b tickets_module http://git.sharix-app.org/ShariX_Open/sharix-open-tickets.git tickets
 
+git clone -b metasynced_module http://git.sharix-app.org/ShariX_Open/sharix-open-backend.git metaservicesynced
+
 python3 -m venv env
 
 source env/bin/activate

+ 1 - 0
install_win.bat

@@ -1,4 +1,5 @@
 @echo off
 git clone -b tickets_module http://git.sharix-app.org/ShariX_Open/sharix-open-tickets.git tickets
+git clone -b metasynced_module http://git.sharix-app.org/ShariX_Open/sharix-open-backend.git metaservicesynced
 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