micro-users 1.5.0__py3-none-any.whl → 1.6.2__py3-none-any.whl

users/views.py

@@ -11,20 +11,23 @@ from django_tables2 import RequestConfig, SingleTableView, SingleTableMixin
 from django_filters.views import FilterView
 from django.views.generic.detail import DetailView
 from django.apps import apps
+from django.utils.module_loading import import_string
+from django.contrib.auth.views import LoginView
+from django.conf import settings
 
 # Project imports
 #################
 
 from .signals import get_client_ip
-from .tables import UserTable, UserActivityLogTable, UserActivityLogTableNoUser
+from .tables import UserTable
 from .forms import CustomUserCreationForm, CustomUserChangeForm, ArabicPasswordChangeForm, ResetPasswordForm, UserProfileEditForm
-from .filters import UserFilter, UserActivityLogFilter
-from .models import UserActivityLog
+from .filters import UserFilter
 
 User = get_user_model() # Use custom user model
 
 # Helper Function to log actions
 def log_user_action(request, instance, action, model_name):
+    UserActivityLog = apps.get_model('users', 'UserActivityLog')
     UserActivityLog.objects.create(
         user=request.user,
         action=action,
@@ -38,6 +41,15 @@ def log_user_action(request, instance, action, model_name):
 
 #####################################################################
 
+# Custom Login View with Theme Injection
+class CustomLoginView(LoginView):
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        # Inject theme configuration from settings
+        context['theme'] = getattr(settings, 'MICRO_USERS_THEME', {})
+        return context
+
+
 # Function to recognize staff
 def is_staff(user):
     return user.is_staff
@@ -64,12 +76,14 @@ class UserListView(LoginRequiredMixin, UserPassesTestMixin, FilterView, SingleTa
     def get_queryset(self):
         # Apply the filter and order by any logic you need
         qs = super().get_queryset().order_by('date_joined')
+        # Exclude soft-deleted users
+        qs = qs.filter(deleted_at__isnull=True)
         # Hide superuser entries from non-superusers
         if not self.request.user.is_superuser:
             qs = qs.exclude(is_superuser=True)
-            # Restrict to same department
-            if self.request.user.department:
-                qs = qs.filter(department=self.request.user.department)
+            # Restrict to same scope
+            if self.request.user.scope:
+                qs = qs.filter(scope=self.request.user.scope)
         return qs
 
     def get_context_data(self, **kwargs):
@@ -91,12 +105,11 @@ def create_user(request):
         form = CustomUserCreationForm(request.POST or None, user=request.user)
         if form.is_valid():
             user = form.save(commit=False)
-            # Auto-assign department for non-superusers
-            if not request.user.is_superuser and request.user.department:
-                user.department = request.user.department
+            # Auto-assign scope for non-superusers
+            if not request.user.is_superuser and request.user.scope:
+                user.scope = request.user.scope
             user.save()
             user.user_permissions.set(form.cleaned_data["permissions"])
-            log_user_action(request, user, "CREATE", "مستخدم")
             return redirect("manage_users")
         else:
             return render(request, "users/user_form.html", {"form": form})
@@ -116,9 +129,9 @@ def edit_user(request, pk):
         messages.error(request, "لا يمكن تعديل هذا الحساب!")
 
 
-    # Restrict to same department
+    # Restrict to same scope
     if not request.user.is_superuser:
-        if request.user.department and user.department != request.user.department:
+        if request.user.scope and user.scope != request.user.scope:
              messages.error(request, "ليس لديك صلاحية لتعديل هذا المستخدم!")
              return redirect('manage_users')
 
@@ -130,7 +143,6 @@ def edit_user(request, pk):
             user = form.save(commit=False)
             user.save()
             user.user_permissions.set(form.cleaned_data["permissions"])
-            log_user_action(request, user, "UPDATE", "مستخدم")
             return redirect("manage_users")
         else:
             # Validation errors will be automatically handled by the form object
@@ -147,24 +159,26 @@ def edit_user(request, pk):
 def delete_user(request, pk):
     user = get_object_or_404(User, pk=pk)
 
-    # Restrict to same department
+    # Restrict to same scope
     if not request.user.is_superuser:
-        if request.user.department and user.department != request.user.department:
+        if request.user.scope and user.scope != request.user.scope:
              messages.error(request, "ليس لديك صلاحية لحذف هذا المستخدم!")
              return redirect('manage_users')
 
     if request.method == "POST":
-        log_user_action(request, user, "DELETE", "مستخدم")
-        user.delete()
+        # Soft delete the user
+        user.is_active = False
+        user.deleted_at = timezone.now()
+        user.save()
         return redirect("manage_users")
     return redirect("manage_users")  # Redirect instead of rendering a separate page
 
 
 # Class Function for the Log
 class UserActivityLogView(LoginRequiredMixin, UserPassesTestMixin, SingleTableMixin, FilterView):
-    model = UserActivityLog
-    table_class = UserActivityLogTable
-    filterset_class = UserActivityLogFilter
+    model = apps.get_model('users', 'UserActivityLog')
+    table_class = import_string('users.tables.UserActivityLogTable')
+    filterset_class = import_string('users.filters.UserActivityLogFilter')
     template_name = "users/user_activity_log.html"
 
     def test_func(self):
@@ -175,14 +189,14 @@ class UserActivityLogView(LoginRequiredMixin, UserPassesTestMixin, SingleTableMi
         qs = super().get_queryset().order_by('-timestamp')
         if not self.request.user.is_superuser:
             qs = qs.exclude(user__is_superuser=True)
-            if self.request.user.department:
-                qs = qs.filter(user__department=self.request.user.department)
+            if self.request.user.scope:
+                qs = qs.filter(user__scope=self.request.user.scope)
         return qs
 
     def get_table(self, **kwargs):
         table = super().get_table(**kwargs)
-        if self.request.user.department:
-            table.exclude = ('department',)
+        if self.request.user.scope:
+            table.exclude = ('scope',)
         return table
 
     def get_context_data(self, **kwargs):
@@ -204,9 +218,11 @@ class UserDetailView(LoginRequiredMixin, UserPassesTestMixin, DetailView):
         context = super().get_context_data(**kwargs)
         
         # self.object is the User instance
+        UserActivityLog = apps.get_model('users', 'UserActivityLog')
         logs_qs = UserActivityLog.objects.filter(user=self.object).order_by('-timestamp')
         
         # Create table manually
+        UserActivityLogTableNoUser = import_string('users.tables.UserActivityLogTableNoUser')
         table = UserActivityLogTableNoUser(logs_qs)
         RequestConfig(self.request, paginate={'per_page': 10}).configure(table)
         
@@ -219,9 +235,9 @@ class UserDetailView(LoginRequiredMixin, UserPassesTestMixin, DetailView):
 def reset_password(request, pk):
     user = get_object_or_404(User, id=pk)
 
-    # Restrict to same department
+    # Restrict to same scope
     if not request.user.is_superuser:
-        if request.user.department and user.department != request.user.department:
+        if request.user.scope and user.scope != request.user.scope:
              messages.error(request, "ليس لديك صلاحية لتعديل هذا المستخدم!")
              return redirect('manage_users')
 
@@ -278,78 +294,84 @@ def edit_profile(request):
         form = UserProfileEditForm(instance=request.user)
     return render(request, 'users/profile/profile_edit.html', {'form': form})
 
-# Department Management Views
+# Scope Management Views
 # ###########################
 from django.template.loader import render_to_string
-from .forms import DepartmentForm
-from .models import Department
-from .tables import DepartmentTable
 
 @login_required # staff check handled in template or can be added here
 @user_passes_test(is_staff)
-def manage_departments(request):
+def manage_scopes(request):
     """
     Returns the initial modal content with the table.
     """
-    if request.user.department:
+    if request.user.scope:
         return JsonResponse({'error': 'Permission denied.'}, status=403)
 
-    table = DepartmentTable(Department.objects.all())
+    Scope = apps.get_model('users', 'Scope')
+    ScopeTable = import_string('users.tables.ScopeTable')
+    table = ScopeTable(Scope.objects.all())
     RequestConfig(request, paginate={'per_page': 5}).configure(table)
     
     context = {'table': table}
-    html = render_to_string('users/partials/department_manager.html', context, request=request)
+    html = render_to_string('users/partials/scope_manager.html', context, request=request)
     return JsonResponse({'html': html})
 
 @login_required
 @user_passes_test(is_staff)
-def get_department_form(request, pk=None):
+def get_scope_form(request, pk=None):
     """
     Returns the Add/Edit form partial.
     """
-    if request.user.department:
+    if request.user.scope:
         return JsonResponse({'error': 'Permission denied.'}, status=403)
 
+    ScopeForm = import_string('users.forms.ScopeForm')
+    Scope = apps.get_model('users', 'Scope')
+
     if pk:
-        department = get_object_or_404(Department, pk=pk)
-        form = DepartmentForm(instance=department)
+        scope = get_object_or_404(Scope, pk=pk)
+        form = ScopeForm(instance=scope)
     else:
-        form = DepartmentForm()
+        form = ScopeForm()
         
-    html = render_to_string('users/partials/department_form.html', {'form': form, 'department_id': pk}, request=request)
+    html = render_to_string('users/partials/scope_form.html', {'form': form, 'scope_id': pk}, request=request)
     return JsonResponse({'html': html})
 
 @login_required
 @user_passes_test(is_staff)
-def save_department(request, pk=None):
+def save_scope(request, pk=None):
     """
     Handles form submission. Returns updated table on success, or form with errors on failure.
     """
-    if request.user.department:
+    if request.user.scope:
         return JsonResponse({'error': 'Permission denied.'}, status=403)
+    
+    ScopeForm = import_string('users.forms.ScopeForm')
+    Scope = apps.get_model('users', 'Scope')
+    ScopeTable = import_string('users.tables.ScopeTable')
 
     if request.method == "POST":
         if pk:
-            department = get_object_or_404(Department, pk=pk)
-            form = DepartmentForm(request.POST, instance=department)
+            scope = get_object_or_404(Scope, pk=pk)
+            form = ScopeForm(request.POST, instance=scope)
         else:
-            form = DepartmentForm(request.POST)
+            form = ScopeForm(request.POST)
 
         if form.is_valid():
             form.save()
             # Return updated table
-            table = DepartmentTable(Department.objects.all())
+            table = ScopeTable(Scope.objects.all())
             RequestConfig(request, paginate={'per_page': 5}).configure(table)
-            html = render_to_string('users/partials/department_manager.html', {'table': table}, request=request)
+            html = render_to_string('users/partials/scope_manager.html', {'table': table}, request=request)
             return JsonResponse({'success': True, 'html': html})
         else:
             # Return form with errors
-            html = render_to_string('users/partials/department_form.html', {'form': form, 'department_id': pk}, request=request)
+            html = render_to_string('users/partials/scope_form.html', {'form': form, 'scope_id': pk}, request=request)
             return JsonResponse({'success': False, 'html': html})
     
     return JsonResponse({'success': False, 'error': 'Invalid method'})
 
 @login_required
 @user_passes_test(is_staff)
-def delete_department(request, pk):
-    return JsonResponse({'success': False, 'error': 'تم تعطيل حذف الأقسام لأسباب أمنية.'})
+def delete_scope(request, pk):
+    return JsonResponse({'success': False, 'error': 'تم تعطيل حذف النطاقات لأسباب أمنية.'})

micro_users-1.5.0.dist-info/RECORD

@@ -1,33 +0,0 @@
-users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-users/admin.py,sha256=tjaAXU5Un6P6sVF9uGXQP6aqyTguMf_jLquidvaD04Y,622
-users/apps.py,sha256=Xb1nGvCl08KaUVqcUG82-jYdG6-KTVjaw_lgr5GIuYY,1133
-users/filters.py,sha256=tXEW7W8V_DsttD0h2Dsc5KUjCQJG18hNqY-w02NqZCw,4722
-users/forms.py,sha256=DQb2GCk9z6NyMtwoL7oCWD2sbTKQ23dMD3opKHCQkhI,16549
-users/models.py,sha256=JZTu3IcsJfE0hkJe8ycFd5ITu-X2KD90Gno6iv0znuY,2479
-users/signals.py,sha256=5Kd3KyfPT6740rvwZj4vy1yXsmjVhmaQ__RB8p5R5aE,1336
-users/tables.py,sha256=m78Ano8k0CCINQrCn9lk08cag6RXjQqTbYBRyfJP64g,2780
-users/urls.py,sha256=4pzhGcwWuLx8rDq_AnkhOhWeRigpOuDgnZCDwTBYi_E,1585
-users/views.py,sha256=aN3qnkkdxWRjvmBAJ8Ay6bWrzZcNMvJpQ8wIQXbk5JQ,13602
-users/migrations/0001_initial.py,sha256=lx9sSKS-lxHhI6gelVH52NOkwqEMJ32TvOJUn9zaOXM,4709
-users/migrations/0002_alter_useractivitylog_action.py,sha256=I7NLxgcPTslCMuADcr1srXS_C_0y_LcZiAFFHBG5NsE,715
-users/migrations/0003_department_alter_useractivitylog_options_and_more.py,sha256=RGTawFewYHxCUVIU8nCKWTTZ5OH22iIcfVv1jk_37K4,1289
-users/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-users/static/css/login.css,sha256=SiJ6jBbWQAP2Nxt7DOTZbTcFYP9JEp557AuQZ9Eirb0,2120
-users/static/img/default_profile.webp,sha256=BKUoQHo4z_fZnmc6z6I-KFvLEHahDr98U9LnDQKHLAM,3018
-users/templates/registration/login.html,sha256=owbzO_XjqMeSncwWxkTzsvbkhjEZd7LdbblC3HBnld0,4091
-users/templates/users/manage_users.html,sha256=rxXZPNXu_cmdnfxFU4K79n4FvjJe4hOZqoT-ybG_JTg,6329
-users/templates/users/user_activity_log.html,sha256=41G7Wjv8ehBTSALwLLVzzoIBIo5hSM3FOw36olDINF8,481
-users/templates/users/user_detail.html,sha256=yPiuOGF96rV8t2H1Fl2hhIq78N1588ZFbh5gbAezaxw,2053
-users/templates/users/user_form.html,sha256=jcyI7OQZOY4ue4DajPtfjAt2SmAYO5ZgHNOqTp2-FO0,1352
-users/templates/users/partials/department_actions.html,sha256=sdZr-awxOeXgPuYHYcrJx6msDcG3KcQzQlCpgseszQ4,283
-users/templates/users/partials/department_form.html,sha256=WvjX8hZjqbLMmFCoACkcHZFXTlAwEdy0GyrMRaobwV8,777
-users/templates/users/partials/department_manager.html,sha256=dB9_sgv2cRr0x3MKM62vDZzPDWZtkpf4ORFYnbYTIYM,399
-users/templates/users/partials/user_actions.html,sha256=J44-sn0fMbLUWjdtlcf5YhgT5OYRykr1mFkeVXoI1ew,1543
-users/templates/users/profile/profile.html,sha256=Ir8zvYUgDm89BlwVuuCsPJIVvTPa_2wH3HAaitPc4s8,2911
-users/templates/users/profile/profile_edit.html,sha256=L9DUHlQHG-PmxwxBbSjgPk1dEmy0spPi6wXzT4hQe-U,4218
-users/templates/users/widgets/grouped_permissions.html,sha256=q51WO-xMvg0aAqn6Ey8pMINDbFOHap_BgHcMxOvfLBw,9878
-micro_users-1.5.0.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
-micro_users-1.5.0.dist-info/METADATA,sha256=V3Nwbu4x03gIRBkO1UIsLLVbPKD3xW-8K2CPqW4aKqs,10721
-micro_users-1.5.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-micro_users-1.5.0.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
-micro_users-1.5.0.dist-info/RECORD,,