mergse

app_settings/admin.py

@@ -1,34 +1,11 @@
-<<<<<<< HEAD
-=======
 # settings/admin.py
 
->>>>>>> antifraud
 from django.contrib import admin
 from .models import LocalDatabase, GlobalHotelSettings, GlobalSystemSettings, TelegramSettings, EmailSettings
 
 @admin.register(LocalDatabase)
 class LocalDatabaseAdmin(admin.ModelAdmin):
     list_display = ['name', 'host', 'port', 'user', 'database', 'is_active']
-<<<<<<< HEAD
-    search_fields = ['name', 'host', 'user', 'database']
-
-@admin.register(GlobalHotelSettings)
-class GlobalHotelSettingsAdmin(admin.ModelAdmin):
-    list_display = ['check_in_time', 'check_out_time', 'global_timezone']
-    list_filter = ['global_timezone']
-
-@admin.register(GlobalSystemSettings)
-class GlobalSystemSettingsAdmin(admin.ModelAdmin):
-    list_display = ['system_name', 'system_version', 'server_timezone']
-
-@admin.register(TelegramSettings)
-class TelegramSettingsAdmin(admin.ModelAdmin):
-    list_display = ['bot_token', 'username']
-
-@admin.register(EmailSettings)
-class EmailSettingsAdmin(admin.ModelAdmin):
-    list_display = ['smtp_server', 'smtp_port', 'smtp_user', 'from_email']
-=======
     search_fields = ['name', 'host','user', 'database']
 
 
@@ -47,4 +24,3 @@ class TelegramSettingsAdmin(admin.ModelAdmin):
 admin.site.register(EmailSettings)  # Register your models here.
 class EmailSettingsAdmin(admin.ModelAdmin):
     list_display = ['email_host', 'email_port', 'email_host_user', 'email_host_password']
->>>>>>> antifraud

app_settings/app_settings.py

@@ -1,8 +1,6 @@
 
-from .models import LocalDatabase
 from decouple import config
 from django.conf import settings
-from .models import LocalDatabase
 from django.apps import apps
 
 def load_database_settings(databases):

app_settings/apps.py

@@ -1,19 +1,3 @@
-<<<<<<< HEAD
-from django.apps import AppConfig, apps
-
-class AppSettingsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'app_settings'
-
-    def ready(self):
-        # Проверяем, что приложения готовы
-        if not apps.ready:
-            return
-        try:
-            import app_settings.signals  # Регистрация сигналов
-        except ImportError as e:
-            print(f"Ошибка импорта signals: {e}")
-=======
 from django.apps import AppConfig
 
 
@@ -21,4 +5,3 @@ class SettingsConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'app_settings'
     verbose_name="Настройки системы"
->>>>>>> antifraud

app_settings/migrations/0001_initial.py

@@ -85,11 +85,7 @@ class Migration(migrations.Migration):
         ),
     ]
 
-<<<<<<< HEAD
-# Generated by Django 5.1.4 on 2024-12-20 11:29
-=======
 # Generated by Django 5.1.4 on 2024-12-23 00:57
->>>>>>> antifraud
 
 from django.db import migrations, models