Merge branch 'v2.5.5-dev' of https://github.com/master3395/cyberpanel into v2.5.5-dev

baseTemplate/models.py

@@ -2,7 +2,7 @@
 
 
 from django.db import models
-from django.contrib.auth.models import User
+from loginSystem.models import Administrator
 
 # Create your models here.
 
@@ -16,15 +16,15 @@ class CyberPanelCosmetic(models.Model):
 
 class UserNotificationPreferences(models.Model):
     """Model to store user notification dismissal preferences"""
-    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='notification_preferences')
+    user = models.OneToOneField(Administrator, on_delete=models.CASCADE, related_name='notification_preferences')
     backup_notification_dismissed = models.BooleanField(default=False, help_text="Whether user has dismissed the backup notification")
     ai_scanner_notification_dismissed = models.BooleanField(default=False, help_text="Whether user has dismissed the AI scanner notification")
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
-    
+
     class Meta:
         verbose_name = "User Notification Preferences"
         verbose_name_plural = "User Notification Preferences"
-    
+
     def __str__(self):
-        return f"Notification Preferences for {self.user.username}"
+        return f"Notification Preferences for {self.user.userName}"

baseTemplate/signals.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from django.contrib.auth.models import User
+from loginSystem.models import Administrator
 from .models import UserNotificationPreferences
 
 
-@receiver(post_save, sender=User)
+@receiver(post_save, sender=Administrator)
 def create_user_notification_preferences(sender, instance, created, **kwargs):
-    """Create default notification preferences when a new user is created"""
+    """Create default notification preferences when a new Administrator is created"""
     if created:
         UserNotificationPreferences.objects.create(
             user=instance,
@@ -16,8 +16,8 @@ def create_user_notification_preferences(sender, instance, created, **kwargs):
         )
 
 
-@receiver(post_save, sender=User)
+@receiver(post_save, sender=Administrator)
 def save_user_notification_preferences(sender, instance, **kwargs):
-    """Save notification preferences when user is saved"""
+    """Save notification preferences when Administrator is saved"""
     if hasattr(instance, 'notification_preferences'):
         instance.notification_preferences.save()

install/install.py

@@ -690,7 +690,25 @@ password="%s"
 
         # self.setupVirtualEnv(self.distro)
 
-        ### Database migrations will be handled after database creation
+        # Now run Django migrations since we're in /usr/local/CyberCP and database exists
+        os.chdir("/usr/local/CyberCP")
+        logging.InstallLog.writeToFile("Running Django migrations...")
+        preFlightsChecks.stdOut("Running Django migrations...")
+
+        # Reset migration history in database (in case of re-installation)
+        command = "/usr/local/CyberPanel-venv/bin/python manage.py migrate --fake-initial"
+        preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
+
+        # Create fresh migrations for all apps
+        command = "/usr/local/CyberPanel-venv/bin/python manage.py makemigrations"
+        preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
+
+        # Apply all migrations with --fake-initial to handle existing tables
+        command = "/usr/local/CyberPanel-venv/bin/python manage.py migrate --fake-initial"
+        preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
+
+        logging.InstallLog.writeToFile("Django migrations completed successfully!")
+        preFlightsChecks.stdOut("Django migrations completed successfully!")
 
         if not os.path.exists("/usr/local/CyberCP/public"):
             os.mkdir("/usr/local/CyberCP/public")
@@ -2917,37 +2935,6 @@ def main():
         installCyberPanel.Main(cwd, mysql, distro, ent, serial, port, args.ftp, args.powerdns, args.publicip,
                                remotemysql, mysqlhost, mysqldb, mysqluser, mysqlpassword, mysqlport)
 
-    # Now that database is created, run Django migrations
-    preFlightsChecks.stdOut("Running Django migrations...")
-    # The application should be at /usr/local/CyberCP after download_install_CyberPanel
-    if os.path.exists("/usr/local/CyberCP"):
-        os.chdir("/usr/local/CyberCP")
-        preFlightsChecks.stdOut("Changed to /usr/local/CyberCP directory for migrations")
-    else:
-        # Check if it's still in cyberpanel (move may have failed)
-        if os.path.exists("/usr/local/cyberpanel"):
-            preFlightsChecks.stdOut("WARNING: Application is in /usr/local/cyberpanel instead of /usr/local/CyberCP")
-            preFlightsChecks.stdOut("Attempting to fix directory structure...")
-
-            # Try to move it now
-            os.chdir("/usr/local")
-            if os.path.exists("CyberCP"):
-                shutil.rmtree("CyberCP")
-            shutil.move("cyberpanel", "CyberCP")
-            os.chdir("/usr/local/CyberCP")
-            preFlightsChecks.stdOut("Fixed: Moved cyberpanel to CyberCP")
-        else:
-            preFlightsChecks.stdOut("ERROR: Neither /usr/local/CyberCP nor /usr/local/cyberpanel exists!")
-            sys.exit(1)
-
-    # Create fresh migrations for all apps
-    command = "/usr/local/CyberPanel-venv/bin/python manage.py makemigrations"
-    preFlightsChecks.call(command, distro, command, command, 1, 1, os.EX_OSERR)
-
-    # Apply all migrations
-    command = "/usr/local/CyberPanel-venv/bin/python manage.py migrate"
-    preFlightsChecks.call(command, distro, command, command, 1, 1, os.EX_OSERR)
-
     checks.setupPHPAndComposer()
     checks.fix_selinux_issue()
     checks.install_psmisc()