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