micro-users 1.1.1__py3-none-any.whl → 1.2.1__py3-none-any.whl

{micro_users-1.1.1.dist-info → micro_users-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micro-users
-Version: 1.1.1
+Version: 1.2.1
 Summary: Arabic Django user management app with abstract user, permissions, and activity logging
 Home-page: https://github.com/debeski/micro-users
 Author: DeBeski
@@ -105,3 +105,17 @@ users/
 ├── templates/     # HTML templates
 └── migrations/    # Database migrations
 ```
+
+## Version History
+
+| Version  | Changes |
+|----------|---------|
+| v1.0.0   | Initial release as pip package |
+| v1.0.1   | Fixed a couple of new issues as a pip package |
+| v1.0.2   | Fixed the readme and building files |
+| v1.0.3   | Still getting the hang of this pip publish thing |
+| v1.0.4   | Honestly still messing with and trying settings and stuff out |
+| v1.1.0   | OK, finally a working seamless micro-users app |
+| v1.1.1   | Fixed a bug where a staff member can edit the admin details |
+| v1.2.0   | Added User Details view with specific user activity log |
+| v1.2.1   | Fixed a minot import bug |

{micro_users-1.1.1.dist-info → micro_users-1.2.1.dist-info}/RECORD

@@ -5,20 +5,21 @@ users/filters.py,sha256=9-yrWBF-CdWb1nrAhmifWb1AHI0z4LQma1uR_9jLr2U,4797
 users/forms.py,sha256=GHC8pFm2i9PD3MVaakrgMXEszsBrXieHq7DYiAfo8Fw,14977
 users/models.py,sha256=KX_6LoiNJN6PCTFOuuGp5so4CNn5pAh1Vpaigv4fKk4,2060
 users/signals.py,sha256=5Kd3KyfPT6740rvwZj4vy1yXsmjVhmaQ__RB8p5R5aE,1336
-users/tables.py,sha256=JS3fvZvwzcNPGAH1LfCCUNnuQXgauDnB--rFt4okC0I,1717
-users/urls.py,sha256=gmk_ZkSg9Bj-fUpIRACL_X7MEADTgZ7uvmbvXoAo5fo,956
-users/views.py,sha256=yfzWkIDha66YK-Rgz7GH7MhQsupSCojf59C7fBqkppI,7209
+users/tables.py,sha256=ZW8_TR6Y3DwchS7Q8DGVdJX01fjIDZfaqoZo0XpZnyU,1920
+users/urls.py,sha256=FwQ9GVOBRQ4iXQ9UyLFI0aEAga0d5qL_miPNpmFPA-Q,1022
+users/views.py,sha256=mruC7kf0_KMiNVxOwZNMyt5pUidu7U3RyIgYHDEFJ_4,8113
 users/migrations/0001_initial.py,sha256=lx9sSKS-lxHhI6gelVH52NOkwqEMJ32TvOJUn9zaOXM,4709
 users/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 users/templates/user_activity_log.html,sha256=S_FDN6vVLz_mB826yjeU9vtVGtzk7E_LKBmQIeYtdkQ,611
 users/templates/registration/login.html,sha256=owbzO_XjqMeSncwWxkTzsvbkhjEZd7LdbblC3HBnld0,4091
-users/templates/users/manage_users.html,sha256=jaYxUGRPyqx8tj9M6aApUZOgmgAIQekFtaL5j1mRPRQ,2951
+users/templates/users/manage_users.html,sha256=ZusUTrJcp-xeORBnOcBObi9q1zlQE9yVRurMEvQVeWQ,2940
 users/templates/users/profile.html,sha256=9ahVF6YZUR-6-c8SKc0rN2pVdis2lI9gbcOQZeMaFnY,2909
 users/templates/users/profile_edit.html,sha256=sgO3h9ffVK1vnDNl4E6l5x3xfam3FTQl6Lqkrw5gmlw,4215
-users/templates/users/user_actions.html,sha256=kuNMZBK9qwrLDU6hhp836Ru_yGVOr-uAeoJBJsZtzP8,1386
+users/templates/users/user_actions.html,sha256=oJedI5NElf-bXFBdeuQVNgx2enbwRsJSowBv5i6PFUE,1625
+users/templates/users/user_detail.html,sha256=jU6GIKlXEwnASDL_yosc6V46SjSwIDAgaRn0_iDK50U,1688
 users/templates/users/user_form.html,sha256=jcyI7OQZOY4ue4DajPtfjAt2SmAYO5ZgHNOqTp2-FO0,1352
-micro_users-1.1.1.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
-micro_users-1.1.1.dist-info/METADATA,sha256=sXwfJIZTPf798hq2QIih9Z33O_1jwySSksk1AaPXhrY,2807
-micro_users-1.1.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-micro_users-1.1.1.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
-micro_users-1.1.1.dist-info/RECORD,,
+micro_users-1.2.1.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
+micro_users-1.2.1.dist-info/METADATA,sha256=Q__3FA_yfJm1I4WY9gLGBeVv8-N7L4fj6tUaLRWGhLE,3421
+micro_users-1.2.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+micro_users-1.2.1.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
+micro_users-1.2.1.dist-info/RECORD,,

users/tables.py

@@ -38,3 +38,9 @@ class UserActivityLogTable(tables.Table):
         template_name = "django_tables2/bootstrap5.html"
         fields = ("timestamp", "user", "user.full_name", "action", "model_name", "object_id", "number")
         attrs = {'class': 'table table-hover align-middle'}
+
+class UserActivityLogTableNoUser(UserActivityLogTable):
+    class Meta(UserActivityLogTable.Meta):
+        # Remove the 'user' and 'user.full_name' columns
+        exclude = ("user", "user.full_name")
+

users/templates/users/manage_users.html

@@ -65,7 +65,7 @@
 
                 // Update the modal content
                 document.getElementById("userName").textContent = userName;
-                form.action = `/manage/users/delete/${userId}/`; // Update form action with user ID
+                form.action = "{% url 'delete_user' 0 %}".replace("/0/", `/${userId}/`);
             });
         });
     </script>

users/templates/users/user_actions.html

@@ -11,7 +11,12 @@
             </li> {% endcomment %}
             {% if not record.is_superuser %}
             <li>
-                <a class="dropdown-item" href="{% url 'edit_user' record.id %}" title="تعديل">
+                <a class="dropdown-item" href="{% url 'user_detail' record.pk %}" title="عرض">
+                    <i class="bi bi-person-dash-fill text-dark me-1 h5"> </i> عرض
+                </a>
+            </li>
+            <li>
+                <a class="dropdown-item" href="{% url 'edit_user' record.pk %}" title="تعديل">
                     <i class="bi bi-person-dash-fill text-dark me-1 h5"> </i> تعديل
                 </a>
             </li>
@@ -19,7 +24,7 @@
             {% if user.is_superuser and not record.is_staff %}
             <li>
                 <a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#deleteModal"
-                data-user-id="{{ record.id }}" data-user-name="{{ record.username }}">
+                data-user-id="{{ record.pk }}" data-user-name="{{ record.username }}">
                 <i class="bi bi-x-octagon text-danger me-1 h5"> </i> حذف
                 </a>
             </li>

users/templates/users/user_detail.html

@@ -0,0 +1,49 @@
+{% extends "base.html" %}
+{% load crispy_forms_tags %}
+{% load django_tables2 %}
+
+{% block content %}
+<div class="container mt-4">
+    <!-- USER INFO CARD -->
+    <div class="card mb-4 shadow-sm">
+        <div class="card-header bg-primary text-white">
+            تفاصيل المستخدم
+        </div>
+        <div class="card-body">
+            <h5>{{ detail_user.get_full_name }} ({{ detail_user.username }})</h5>
+            <p class="mb-1"><strong>البريد:</strong> {{ detail_user.email }}</p>
+            <p class="mb-1"><strong>تاريخ الإنشاء:</strong> {{ detail_user.date_joined|date:"Y-m-d" }}</p>
+            <p class="mb-1"><strong>آخر دخول:</strong> {{ detail_user.last_login|date:"Y-m-d H:i" }}</p>
+            <p class="mb-1"><strong>الصلاحيات:</strong>
+                {% if detail_user.is_superuser %}
+                    مدير النظام
+                {% elif detail_user.is_staff %}
+                    مستخدم اداري
+                {% else %}
+                    مستخدم عادي
+                {% endif %}
+            </p>
+        </div>
+    </div>
+
+    <!-- ACTIVITY LOG TABLE -->
+    <div class="card shadow-sm">
+        <div class="card-header bg-secondary text-white">
+            سجل نشاط المستخدم
+        </div>
+        <div class="card-body">
+            {% render_table table %}
+        </div>
+    </div>
+
+    <!-- BACK BUTTON -->
+    <div class="mb-3">
+        <a href="{% url 'manage_users' %}" class="btn btn-outline-secondary">
+            <i class="bi bi-arrow-right me-2"></i> العودة إلى إدارة المستخدمين
+        </a>
+    </div>
+
+</div>
+
+
+{% endblock %}

users/urls.py

@@ -9,10 +9,11 @@ urlpatterns = [
     path('logout/', auth_views.LogoutView.as_view(), name='logout'),
     path("users/", views.UserListView.as_view(), name="manage_users"),
     path('users/create/', views.create_user, name='create_user'),
-    path('users/edit/<int:user_id>/', views.edit_user, name='edit_user'),
-    path('users/delete/<int:user_id>/', views.delete_user, name='delete_user'),
+    path('users/edit/<int:pk>/', views.edit_user, name='edit_user'),
+    path('users/delete/<int:pk>/', views.delete_user, name='delete_user'),
     path("profile", views.user_profile, name="user_profile"),
     path('profile/edit/', views.edit_profile, name='edit_profile'),
     path("logs/", views.UserActivityLogView.as_view(), name="user_activity_log"),
-    path('reset_password/<int:user_id>/', views.reset_password, name="reset_password"),
+    path('reset_password/<int:pk>/', views.reset_password, name="reset_password"),
+    path("users/<int:pk>/", views.UserDetailView.as_view(), name="user_detail"),
 ]

users/views.py

@@ -9,12 +9,13 @@ from django.http import JsonResponse
 from django.shortcuts import render, redirect, get_object_or_404
 from django_tables2 import RequestConfig, SingleTableView
 from django_filters.views import FilterView
+from django.views.generic.detail import DetailView
 
 # Project imports
 #################
 
 from .signals import get_client_ip
-from .tables import UserTable, UserActivityLogTable
+from .tables import UserTable, UserActivityLogTable, UserActivityLogTableNoUser
 from .forms import CustomUserCreationForm, CustomUserChangeForm, ArabicPasswordChangeForm, ResetPasswordForm, UserProfileEditForm
 from .filters import UserFilter, UserActivityLogFilter
 from .models import UserActivityLog
@@ -32,6 +33,7 @@ def is_staff(user):
 def is_superuser(user):
     return user.is_superuser 
 
+
 # Class Function for managing users
 class UserListView(LoginRequiredMixin, UserPassesTestMixin, FilterView, SingleTableView):
     model = User
@@ -80,8 +82,8 @@ def create_user(request):
 
 # Function for editing an existing User
 @user_passes_test(is_staff)
-def edit_user(request, user_id):
-    user = get_object_or_404(User, id=user_id)
+def edit_user(request, pk):
+    user = get_object_or_404(User, pk=pk)
     form_reset = ResetPasswordForm(user, data=request.POST or None)
 
     if request.method == "POST":
@@ -101,8 +103,8 @@ def edit_user(request, user_id):
 
 # Function for deleting a User
 @user_passes_test(is_superuser)
-def delete_user(request, user_id):
-    user = get_object_or_404(User, id=user_id)
+def delete_user(request, pk):
+    user = get_object_or_404(User, pk=pk)
     if request.method == "POST":
         user.delete()
         UserActivityLog.objects.create(
@@ -139,10 +141,35 @@ class UserActivityLogView(LoginRequiredMixin, UserPassesTestMixin, SingleTableVi
         return context
 
 
+class UserDetailView(LoginRequiredMixin, UserPassesTestMixin, DetailView, SingleTableView):
+    model = User
+    template_name = "users/user_detail.html"
+    context_object_name = "detail_user"  # Keep clear naming
+    table_class = UserActivityLogTableNoUser
+    paginate_by = 10
+
+    def test_func(self):
+        # only staff can view user detail page
+        return self.request.user.is_staff
+
+    def get_queryset(self):
+        # This is for the DetailView (only target user)
+        return User.objects.all()
+
+    def get_table_data(self):
+        # filter log table to user in URL
+        return UserActivityLog.objects.filter(user=self.get_object()).order_by('-timestamp')
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['table'] = self.get_table()  # table instance
+        return context
+
+
 # Function that resets a user password
 @user_passes_test(is_staff)
-def reset_password(request, user_id):
-    user = get_object_or_404(User, id=user_id)
+def reset_password(request, pk):
+    user = get_object_or_404(User, id=pk)
 
     if request.method == "POST":
         form = ResetPasswordForm(user=user, data=request.POST)  # ✅ Correct usage with SetPasswordForm
@@ -151,7 +178,7 @@ def reset_password(request, user_id):
             return redirect("manage_users")  # Redirect after successful reset
         else:
             print("Form errors:", form.errors)  # Debugging
-            return redirect("edit_user", user_id=user_id)  # Redirect to edit user on failure
+            return redirect("edit_user", pk=pk)  # Redirect to edit user on failure
     
     return redirect("manage_users")  # Fallback redirect