diff --git a/accounts_ext/admin.py b/accounts_ext/admin.py index 7bb804f..a15acc4 100644 --- a/accounts_ext/admin.py +++ b/accounts_ext/admin.py @@ -3,10 +3,10 @@ from django.contrib.auth import get_user_model from django.contrib.auth.models import Group as GroupBase from django.contrib.auth.admin import UserAdmin as BaseUserAdmin, GroupAdmin from django.urls import reverse_lazy -from django.utils.html import format_html, escape from django.utils.translation import ugettext_lazy as _ from import_export import resources from jet.filters import RelatedFieldAjaxListFilter, DateRangeFilter +from rangefilter.filter import DateTimeRangeFilter from core.admin import SafeModelAdmin from referral.admin import ReferralAdminInline @@ -26,13 +26,12 @@ class CustomUserResource(resources.ModelResource): @admin.register(get_user_model()) class UserAdmin(SafeModelAdmin, BaseUserAdmin): - inlines = ( ReferralAdminInline, ) fieldsets = ( - (None, {'fields': ('email', 'username', 'password','referral_code')}), + (None, {'fields': ('email', 'username', 'password', 'referral_code')}), (_('Permissions'), {'fields': ('status', 'is_superuser', 'groups', 'user_permissions')}), (_('Important dates'), {'fields': ('last_login', 'confirmed_at')}), @@ -51,7 +50,7 @@ class UserAdmin(SafeModelAdmin, BaseUserAdmin): 'status', 'is_superuser', 'groups', ('confirmed_at', DateRangeFilter), ('create_at', DateRangeFilter), - ('updated_at', DateRangeFilter), + ('updated_at', DateTimeRangeFilter), ) search_fields = ('username', 'first_name', 'last_name', 'email') @@ -84,6 +83,7 @@ class UserAdmin(SafeModelAdmin, BaseUserAdmin): queryset = queryset.exclude(referral_owner__id=request.resolver_match.kwargs.get('object_id', None)) return queryset + @admin.register(Profile) class ProfileAdmin(admin.ModelAdmin): search_fields = ('first_name', 'last_name', 'phone')