new release

ashwin31 · ashwin31 · commit dc16aab047ba · 2024-02-16T08:37:53.000+05:30
diff --git a/common/manager.py b/common/manager.py
@@ -0,0 +1,24 @@
+from django.contrib.auth.models import BaseUserManager
+
+class UserManager(BaseUserManager):
+    def create_user(self, email, password=None, **extra_fields):
+        if not email:
+            raise ValueError('The Email field must be set')
+        email = self.normalize_email(email)
+        user = self.model(email=email, **extra_fields)
+        user.set_password(password)
+        user.save(using=self._db)
+        return user
+
+    def create_superuser(self, email, password=None, **extra_fields):
+        extra_fields.setdefault('is_superuser', True)
+        extra_fields.setdefault('is_staff', True)
+
+        if extra_fields.get('is_staff') is not True:
+            raise ValueError('Superuser must have is_staff=True.')
+            
+
+        if extra_fields.get('is_superuser') is not True:
+            raise ValueError('Superuser must have is_superuser=True.')
+
+        return self.create_user(email, password, **extra_fields)
diff --git a/common/migrations/0008_alter_user_managers.py b/common/migrations/0008_alter_user_managers.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.1 on 2024-02-14 06:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0007_org_is_active'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='user',
+            managers=[
+            ],
+        ),
+    ]
diff --git a/common/migrations/0009_user_is_staff.py b/common/migrations/0009_user_is_staff.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.1 on 2024-02-14 07:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0008_alter_user_managers'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='is_staff',
+            field=models.BooleanField(default=False, verbose_name='staff status'),
+        ),
+    ]
diff --git a/common/models.py b/common/models.py
@@ -5,7 +5,8 @@
 import uuid
 import arrow
 from django.contrib.auth.models import AbstractUser
-from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, UserManager
+from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin
+from .manager import UserManager
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -41,9 +42,10 @@ class User(AbstractBaseUser, PermissionsMixin):
     activation_key = models.CharField(max_length=150, null=True, blank=True)
     key_expires = models.DateTimeField(null=True, blank=True)
     is_active = models.BooleanField(default=True)
+    is_staff = models.BooleanField(_('staff status'),default=False)
 
     USERNAME_FIELD = "email"
-    REQUIRED_FIELDS = ["username"]
+    REQUIRED_FIELDS = []
 
 
     objects = UserManager()
diff --git a/crm/settings.py b/crm/settings.py
@@ -53,6 +53,7 @@
     "modelcluster",
     "taggit",
     "django.contrib.auth",
+    "django.contrib.admin",
     "django.contrib.contenttypes",
     "django.contrib.messages",
     "django.contrib.sessions",
diff --git a/crm/urls.py b/crm/urls.py
@@ -1,5 +1,5 @@
 import os
-
+from django.contrib import admin
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib.auth import views
@@ -31,6 +31,8 @@
         "logout/", views.LogoutView.as_view(), {"next_page": "/login/"}, name="logout"
     ),
     path("admin/", include(wagtailadmin_urls)),
+    
+    path("django/admin/", admin.site.urls),
     path("documents/", include(wagtaildocs_urls)),
     path("schema/", SpectacularAPIView.as_view(), name="schema"),
     # Optional UI:
diff --git a/planner/admin.py b/planner/admin.py
@@ -1,8 +1,8 @@
 from django.contrib import admin
 
-from planner.models import Event, Reminder
+from .models import  Reminder
 
 # Register your models here.
 
-admin.site.register(Event)
+# admin.site.register(Event)
 admin.site.register(Reminder)
