django-cfg 1.3.11__py3-none-any.whl → 1.4.0__py3-none-any.whl

django_cfg/__init__.py

@@ -32,7 +32,7 @@ Example:
 default_app_config = "django_cfg.apps.DjangoCfgConfig"
 
 # Version information
-__version__ = "1.3.11"
+__version__ = "1.4.0"
 __license__ = "MIT"
 
 # Import registry for organized lazy loading

django_cfg/apps/accounts/admin/inlines.py

@@ -48,6 +48,7 @@ class UserActivityInline(TabularInline):
     """Enhanced inline for user activities."""
     model = UserActivity
     extra = 0
+    max_num = 10  # Limit to 10 most recent activities
     readonly_fields = ["created_at", "activity_type", "description"]
     fields = ["activity_type", "description", "ip_address", "created_at"]
     ordering = ["-created_at"]
@@ -57,7 +58,8 @@ class UserActivityInline(TabularInline):
     # Show only recent activities to avoid performance issues
     def get_queryset(self, request):
         qs = super().get_queryset(request)
-        return qs[:10]  # Limit to 10 most recent activities
+        # Don't slice here - let Django handle formset filtering first
+        return qs.order_by('-created_at')
 
     def has_add_permission(self, request, obj=None):
         return False
@@ -88,6 +90,7 @@ class UserEmailLogInline(TabularInline):
             super().__init__(*args, **kwargs)
     
     extra = 0
+    max_num = 15  # Limit to 15 most recent emails
     readonly_fields = ["newsletter", "campaign", "recipient", "subject", "status", "created_at", "sent_at"]
     fields = ["newsletter", "campaign", "subject", "status", "created_at", "sent_at"]
     ordering = ["-created_at"]
@@ -99,7 +102,8 @@ class UserEmailLogInline(TabularInline):
         if not self.model:
             return self.model.objects.none()
         qs = super().get_queryset(request)
-        return qs[:15]  # Limit to 15 most recent emails
+        # Don't slice here - let Django handle formset filtering first
+        return qs.order_by('-created_at')
     
     def has_add_permission(self, request, obj=None):
         return False
@@ -139,8 +143,9 @@ class UserSupportTicketsInline(TabularInline):
             super().__init__(*args, **kwargs)
     
     extra = 0
-    readonly_fields = ["uuid", "subject", "status", "priority", "created_at"]
-    fields = ["uuid", "subject", "status", "priority", "created_at"]
+    max_num = 10  # Limit to 10 most recent tickets
+    readonly_fields = ["uuid", "subject", "status", "created_at"]
+    fields = ["uuid", "subject", "status", "created_at"]
     ordering = ["-created_at"]
     verbose_name = "Support Ticket"
     verbose_name_plural = "Support Tickets"
@@ -150,7 +155,8 @@ class UserSupportTicketsInline(TabularInline):
         if not self.model:
             return self.model.objects.none()
         qs = super().get_queryset(request)
-        return qs[:10]  # Limit to 10 most recent tickets
+        # Don't slice here - let Django handle formset filtering first
+        return qs.order_by('-created_at')
     
     def has_add_permission(self, request, obj=None):
         return False

django_cfg/apps/accounts/admin/user_admin.py

@@ -26,6 +26,7 @@ from django_cfg.modules.django_admin import (
     display,
     action
 )
+from django_cfg.modules.django_admin.utils.displays import UserDisplay
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
 from ..models import CustomUser
@@ -136,14 +137,14 @@ class CustomUserAdmin(BaseUserAdmin, OptimizedModelAdmin, DisplayMixin, Standalo
             
         return inlines
     
-    @display(description="Avatar")
+    @display(description="Avatar", header=True)
     def avatar_display(self, obj):
         """Enhanced avatar display with fallback initials."""
         config = UserDisplayConfig(
             show_avatar=True,
             avatar_size=32
         )
-        return self.display_user_avatar(obj, config)
+        return UserDisplay.with_avatar(obj, config)
     
     @display(description="Email")
     def email_display(self, obj):
@@ -296,27 +297,35 @@ class CustomUserAdmin(BaseUserAdmin, OptimizedModelAdmin, DisplayMixin, Standalo
         success_message="Redirected to email history for {result}",
         error_message="❌ Error accessing email history: {error}"
     )
-    def view_user_emails(self, request, object_id):
+    def view_user_emails(self, request):
         """View all emails sent to this user."""
+        # Extract object_id from request path
+        # URL format: /admin/django_cfg_accounts/customuser/<object_id>/view-user-emails/
+        path_parts = request.path.strip('/').split('/')
+        try:
+            object_id = path_parts[-2]  # Get the ID before the action name
+        except IndexError:
+            raise Exception("Could not determine user ID from URL")
+
         # Get the user object
         user = self.get_object(request, object_id)
         if not user:
             raise Exception("User not found")
-        
+
         # Check if newsletter app is enabled
         from django_cfg.modules.base import BaseCfgModule
         base_module = BaseCfgModule()
-        
+
         if not base_module.is_newsletter_enabled():
             raise Exception("Newsletter app is not enabled")
-        
+
         # Redirect to EmailLog changelist filtered by this user
         url = reverse('admin:django_cfg_newsletter_emaillog_changelist')
         redirect_url = f"{url}?user__id__exact={user.id}"
-        
+
         # Return redirect (handled by standalone_action decorator)
         return redirect(redirect_url)
-    
+
     @standalone_action(
         description="🎫 View Support Tickets",
         variant=ActionVariant.SUCCESS,
@@ -324,26 +333,33 @@ class CustomUserAdmin(BaseUserAdmin, OptimizedModelAdmin, DisplayMixin, Standalo
         success_message="Redirected to support tickets for {result}",
         error_message="❌ Error accessing support tickets: {error}"
     )
-    def view_user_tickets(self, request, object_id):
+    def view_user_tickets(self, request):
         """View all support tickets for this user."""
+        # Extract object_id from request path
+        path_parts = request.path.strip('/').split('/')
+        try:
+            object_id = path_parts[-2]  # Get the ID before the action name
+        except IndexError:
+            raise Exception("Could not determine user ID from URL")
+
         # Get the user object
         user = self.get_object(request, object_id)
         if not user:
             raise Exception("User not found")
-        
+
         # Check if support app is enabled
         from django_cfg.modules.base import BaseCfgModule
         base_module = BaseCfgModule()
-        
+
         if not base_module.is_support_enabled():
             raise Exception("Support app is not enabled")
-        
+
         # Redirect to Ticket changelist filtered by this user
         url = reverse('admin:django_cfg_support_ticket_changelist')
         redirect_url = f"{url}?user__id__exact={user.id}"
-        
+
         return redirect(redirect_url)
-    
+
     @standalone_action(
         description="📊 Export User Data",
         variant=ActionVariant.WARNING,
@@ -351,12 +367,19 @@ class CustomUserAdmin(BaseUserAdmin, OptimizedModelAdmin, DisplayMixin, Standalo
         success_message="📊 User data export completed: {result}",
         error_message="❌ Export failed: {error}"
     )
-    def export_user_data(self, request, object_id):
+    def export_user_data(self, request):
         """Export comprehensive user data."""
+        # Extract object_id from request path
+        path_parts = request.path.strip('/').split('/')
+        try:
+            object_id = path_parts[-2]  # Get the ID before the action name
+        except IndexError:
+            raise Exception("Could not determine user ID from URL")
+
         user = self.get_object(request, object_id)
         if not user:
             raise Exception("User not found")
-        
+
         # Here you would implement actual export logic
         # For now, just return a success message
         return f"Data for {user.get_full_name() or user.email}"

django_cfg/apps/accounts/serializers/profile.py

@@ -152,7 +152,7 @@ class UserWithSourcesSerializer(UserSerializer):
     
     def get_primary_source(self, obj):
         """Get the primary source for the user."""
-        primary_source = obj.get_primary_source()
+        primary_source = obj.primary_source
         if primary_source:
             return RegistrationSourceSerializer(primary_source).data
         return None

django_cfg/apps/accounts/services/otp_service.py

@@ -6,7 +6,7 @@ from typing import Optional
 
 from django_cfg.modules.django_telegram import DjangoTelegram
 from ..models import OTPSecret, CustomUser
-from ..utils.auth_email_service import AuthEmailService
+from ..utils.notifications import AccountNotifications
 from ..signals import notify_failed_otp_attempt
 
 logger = logging.getLogger(__name__)
@@ -19,7 +19,7 @@ class OTPService:
     def _get_otp_url(otp_code: str) -> str:
         """Get OTP verification URL from configuration."""
         try:
-            from django_cfg.core.config import get_current_config
+            from django_cfg.core.state import get_current_config
             config = get_current_config()
             if config and hasattr(config, 'get_otp_url'):
                 return config.get_otp_url(otp_code)
@@ -74,19 +74,26 @@ class OTPService:
             OTPSecret.objects.create(email=cleaned_email, secret=otp_code)
             logger.info(f"Generated new OTP for {cleaned_email}")
 
-        # Send email using AuthEmailService
+        # Send email using AccountNotifications
         try:
-            # Generate OTP link
-
-            otp_link = OTPService._get_otp_url(otp_code)
-
-            # Send OTP email
-            email_service = AuthEmailService(user)
-            email_service.send_otp_email(otp_code, otp_link)
+            # Send OTP notification
+            AccountNotifications.send_otp_notification(
+                user=user,
+                otp_code=otp_code,
+                is_new_user=created,
+                source_url=source_url,
+                channel='email',
+                send_email=True,
+                send_telegram=False  # Telegram notification sent separately below
+            )
 
             # Send welcome email for new users
             if created:
-                email_service.send_welcome_email(user.username)
+                AccountNotifications.send_welcome_email(
+                    user=user,
+                    send_email=True,
+                    send_telegram=False
+                )
 
             # Send Telegram notification for OTP request
             try:

django_cfg/apps/accounts/signals.py

@@ -8,19 +8,19 @@ from django.dispatch import receiver
 from django.contrib.auth import get_user_model
 from django.utils import timezone
 
-from .utils.auth_email_service import AuthEmailService
+from .utils.notifications import AccountNotifications
 from django_cfg.modules.django_telegram import DjangoTelegram
 
 User = get_user_model()
 logger = logging.getLogger(__name__)
 
 
-@receiver(post_save, sender=User)
-def send_user_registration_email(sender, instance, created, **kwargs):
-    """Send welcome email when new user is created - DISABLED for manual control."""
-    # Welcome emails should only be sent through views, not automatically via signals
-    # This prevents unwanted emails during imports, admin creation, etc.
-    pass
+# @receiver(post_save, sender=User)
+# def send_user_registration_email(sender, instance, created, **kwargs):
+#     """Send welcome email when new user is created - DISABLED for manual control."""
+#     # Welcome emails should only be sent through views, not automatically via signals
+#     # This prevents unwanted emails during imports, admin creation, etc.
+#     pass
 
 
 @receiver(pre_save, sender=User)
@@ -33,14 +33,12 @@ def send_user_status_change_emails(sender, instance, **kwargs):
             
             # Check if user was activated
             if not old_instance.is_active and instance.is_active:
-                email_service = AuthEmailService(instance)
-                email_service.send_account_activated_email()
+                AccountNotifications.send_account_status_change(instance, "activated")
                 logger.info(f"Account activation email sent to {instance.email}")
-            
+
             # Check if user was deactivated
             elif old_instance.is_active and not instance.is_active:
-                email_service = AuthEmailService(instance)
-                email_service.send_account_locked_email("Account deactivated by administrator")
+                AccountNotifications.send_account_status_change(instance, "deactivated", reason="Account deactivated by administrator")
                 logger.info(f"Account deactivation email sent to {instance.email}")
                 
     except User.DoesNotExist:
@@ -72,12 +70,7 @@ def send_user_profile_update_email(sender, instance, **kwargs):
             
             # Send notification if there were important changes
             if changes:
-                email_service = AuthEmailService(instance)
-                change_text = ", ".join(changes)
-                email_service.send_security_alert_email(
-                    "Profile Updated",
-                    f"Your {change_text} has been updated. If this wasn't you, please contact support immediately."
-                )
+                AccountNotifications.send_profile_update_notification(instance, changes, send_email=True, send_telegram=True)
                 logger.info(f"Profile update notification sent to {instance.email}")
                 
     except User.DoesNotExist:
@@ -91,18 +84,16 @@ def send_user_login_notification(sender, instance, created, **kwargs):
     """Send login notification email (triggered by login events)."""
     if not created and hasattr(instance, '_login_time'):
         try:
-            email_service = AuthEmailService(instance)
-            login_time = instance._login_time.strftime("%Y-%m-%d %H:%M:%S UTC")
             ip_address = getattr(instance, '_login_ip', None)
-            
-            email_service.send_login_notification_email(login_time, ip_address)
+
+            AccountNotifications.send_login_notification(instance, ip_address=ip_address, send_email=False, send_telegram=True)
             logger.info(f"Login notification sent to {instance.email}")
-            
+
             # Clean up temporary attributes
             delattr(instance, '_login_time')
             if hasattr(instance, '_login_ip'):
                 delattr(instance, '_login_ip')
-                
+
         except Exception as e:
             logger.error(f"Failed to send login notification to {instance.email}: {e}")