micro-users 1.3.1__py3-none-any.whl → 1.4.0__py3-none-any.whl

micro_users-1.4.0.dist-info/METADATA

@@ -0,0 +1,284 @@
+Metadata-Version: 2.1
+Name: micro-users
+Version: 1.4.0
+Summary: Arabic Django user management app with abstract user, permissions, and activity logging
+Home-page: https://github.com/debeski/micro-users
+Author: DeBeski
+Author-email: DeBeski <debeski1@gmail.com>
+License: MIT
+Keywords: django,users,permissions,authentication
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 5
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: Django (>=5.1)
+Requires-Dist: django-crispy-forms (>=2.4)
+Requires-Dist: django-tables2 (>=2.7)
+Requires-Dist: django-filter (>=24.3)
+Requires-Dist: pillow (>=11.0)
+Requires-Dist: babel (>=2.1)
+
+# Micro Users - Arabic Django User Management App
+
+[![PyPI version](https://badge.fury.io/py/micro-users.svg)](https://pypi.org/project/micro-users/)
+
+**Arabic** lightweight, reusable Django app providing user management with abstract user, permissions, localization, and activity logging.
+
+## Requirements
+- **Must be installed on a fresh database.**
+- Python 3.11+
+- Django 5.1+
+- django-crispy-forms 2.4+
+- django-tables2 2.7+
+- django-filter 24.3+
+- pillow 11.0+
+- babel 2.1+
+
+## Features
+- Custom AbstractUser model
+- User permissions system  
+- Activity logging (login/logout, CRUD tracking)
+- Specific User detail and log view *new*
+- Localization support
+- Admin interface integration
+- CRUD views and templates
+- Filtering and tabulation
+> *Future updates are planned to support dynamic language switching between RTL and LTR.*
+
+## Installation
+
+```bash
+pip install git+https://github.com/debeski/micro-users.git
+# OR
+pip install micro-users
+```
+
+## Configuration
+
+1. Add to `INSTALLED_APPS`:
+```python
+INSTALLED_APPS = [
+    'users',  # Preferably on top
+    'django.contrib.admin',
+    'django.contrib.auth',
+    ...
+]
+```
+
+2. Set custom user model in settings.py:
+```python
+AUTH_USER_MODEL = 'users.CustomUser'
+```
+
+3. Include URLs in your main project folder `urls.py`:
+```python
+urlpatterns = [
+    ...
+    path('manage/', include('users.urls')),
+]
+```
+
+4. Run migrations:
+```bash
+python manage.py migrate users
+```
+
+## How to Use
+
+Once configured, the app automatically handles user management and activity logging. Ensure your project has a `base.html` template in the root templates directory, as all user management templates extend it.
+
+### Activity Logging
+
+The app automatically logs **LOGIN** and **LOGOUT** actions. For custom logging of other actions in your application, you can use the following helper functions:
+
+#### Available Helper Functions
+
+1. **Get Client IP** - Extract the user's IP address from request:
+```python
+from users.signals import get_client_ip
+
+# Usage in views
+ip_address = get_client_ip(request)
+```
+
+2. **Log User Action** - Create a reusable logging function:
+```python
+from django.utils import timezone
+from users.models import UserActivityLog
+from users.signals import get_client_ip
+
+def log_user_action(request, instance, action, model_name):
+    """
+    Logs a user action to the activity log.
+    
+    Args:
+        request: HttpRequest object
+        instance: The model instance being acted upon
+        action: Action type (see ACTION_TYPES below)
+        model_name: Name of the model/entity (in Arabic or English)
+    """
+    UserActivityLog.objects.create(
+        user=request.user,
+        action=action,
+        model_name=model_name,
+        object_id=instance.pk,
+        number=instance.number if hasattr(instance, 'number') else '',
+        timestamp=timezone.now(),
+        ip_address=get_client_ip(request),
+        user_agent=request.META.get("HTTP_USER_AGENT", ""),
+    )
+```
+
+#### Action Types Available
+Use these constants when logging actions:
+
+| Action Constant | Arabic Display | Description |
+|-----------------|----------------|-------------|
+| `'LOGIN'` | تسجيل دخـول | User login (auto-logged) |
+| `'LOGOUT'` | تسجيل خـروج | User logout (auto-logged) |
+| `'CREATE'` | انشـاء | Object creation |
+| `'UPDATE'` | تعديـل | Object modification |
+| `'DELETE'` | حــذف | Object deletion |
+| `'VIEW'` | عـرض | Object viewing |
+| `'DOWNLOAD'` | تحميل | File download |
+| `'CONFIRM'` | تأكيـد | Action confirmation |
+| `'REJECT'` | رفــض | Action rejection |
+| `'RESET'` | اعادة ضبط | Password/Data reset |
+
+#### Usage Examples
+
+1. **Logging a CREATE action**:
+```python
+def create_document(request):
+    # ... create logic ...
+    document = Document.objects.create(...)
+    
+    # Log the action
+    from users.models import UserActivityLog
+    from users.signals import get_client_ip
+    
+    UserActivityLog.objects.create(
+        user=request.user,
+        action='CREATE',
+        model_name='وثيقة',
+        object_id=document.pk,
+        number=document.number,
+        ip_address=get_client_ip(request),
+        user_agent=request.META.get("HTTP_USER_AGENT", ""),
+    )
+```
+
+2. **Using the helper function**:
+```python
+# Create a helper function in your app
+def log_action(request, instance, action, model_name):
+    from users.models import UserActivityLog
+    from users.signals import get_client_ip
+    from django.utils import timezone
+    
+    UserActivityLog.objects.create(
+        user=request.user,
+        action=action,
+        model_name=model_name,
+        object_id=instance.pk,
+        number=getattr(instance, 'number', ''),
+        timestamp=timezone.now(),
+        ip_address=get_client_ip(request),
+        user_agent=request.META.get("HTTP_USER_AGENT", ""),
+    )
+
+# Usage in views
+def update_order(request, order_id):
+    order = get_object_or_404(Order, pk=order_id)
+    # ... update logic ...
+    log_action(request, order, 'UPDATE', 'طلب')
+```
+
+3. **Logging without an instance** (for general actions):
+```python
+def log_general_action(request, action, model_name, description=''):
+    from users.models import UserActivityLog
+    from users.signals import get_client_ip
+    from django.utils import timezone
+    
+    UserActivityLog.objects.create(
+        user=request.user,
+        action=action,
+        model_name=model_name,
+        object_id=None,
+        number=description,
+        timestamp=timezone.now(),
+        ip_address=get_client_ip(request),
+        user_agent=request.META.get("HTTP_USER_AGENT", ""),
+    )
+
+# Usage
+log_general_action(request, 'CONFIRM', 'نظام', 'تم تأكيد الإعدادات')
+```
+
+## Available URLs
+
+All user management URLs are prefixed with `manage/` as configured. Below is the complete list:
+
+| URL Pattern | View/Function | Description |
+|-------------|---------------|-------------|
+| `manage/login/` | `auth_views.LoginView.as_view()` | User login |
+| `manage/logout/` | `auth_views.LogoutView.as_view()` | User logout |
+| `manage/users/` | `views.UserListView.as_view()` | List all users |
+| `manage/users/create/` | `views.create_user` | Create new user |
+| `manage/users/edit/<int:pk>/` | `views.edit_user` | Edit existing user |
+| `manage/users/delete/<int:pk>/` | `views.delete_user` | Delete user |
+| `manage/users/<int:pk>/` | `views.UserDetailView.as_view()` | View user details |
+| `manage/profile` | `views.user_profile` | View current user profile |
+| `manage/profile/edit/` | `views.edit_profile` | Edit current profile |
+| `manage/logs/` | `views.UserActivityLogView.as_view()` | View activity logs |
+| `manage/reset_password/<int:pk>/` | `views.reset_password` | Reset user password |
+
+## Structure
+```
+users/
+├── views.py        # CRUD operations
+├── urls.py         # URL routing
+├── tables.py       # User and Activity Log tables
+├── signals.py      # Logging signals
+├── models.py       # User model, permissions, activity logs
+├── forms.py        # Creation, edit,. etc.
+├── filter.py       # Search filters
+├── apps.py         # Permissions Localization
+├── admin.py        # Admin UI integration
+├── __init__.py     # Python init
+├── templates/      # HTML templates
+├── static/         # CSS classes
+└── 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 an expolit where a staff member could disable the ADMIN user |
+| v1.2.0   | • Added User Details view with specific user activity log |
+| v1.2.1   | • Fixed a minor import bug |
+| v1.2.2   | • Separated user detail view from table for consistency<br> • Optimized the new detail + log view for optimal compatibiliyy with users |
+| v1.2.3   | • Fixed a couple of visual inconsistencies |
+| v1.3.0   | • Patched a critical security permission issue<br> • Disabled ADMIN from being viewed/edited from all other members<br> • Fixed a crash when sorting with full_name<br> • Enabled Logging for all actions |
+| v1.3.1   | • Corrected a misplaced code that caused a crash when editing profile |
+| v1.3.2   | • Minor table modifications |
+| v1.4.0   | • Redesigned Permissions UI (Grouped by App/Action) <br> • Added Global Bulk Permission Selectors <br> • Improved Arabic Localization for Permissions <br> • Optimized printing (hidden forms/buttons) <br> • Fixed various bugs and crashes |

{micro_users-1.3.1.dist-info → micro_users-1.4.0.dist-info}/RECORD

@@ -2,10 +2,10 @@ users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 users/admin.py,sha256=VF0V6hQ9Obcdinnjb8nBHaknas2p3O5w-6yAJ-DeARQ,636
 users/apps.py,sha256=Xb1nGvCl08KaUVqcUG82-jYdG6-KTVjaw_lgr5GIuYY,1133
 users/filters.py,sha256=neOdbyOSYVQXAQ2vKAW-0bcj7KIh9xc8UboHTlaZU4Q,4785
-users/forms.py,sha256=GHC8pFm2i9PD3MVaakrgMXEszsBrXieHq7DYiAfo8Fw,14977
+users/forms.py,sha256=F4hb0EJhzpejhk3eLhtwukoRA30SncoI1azttroEpv8,15302
 users/models.py,sha256=V_SIyGGq2w_bww7YufMjqXMSKN1u9CkSMPuOLiwPjtc,2100
 users/signals.py,sha256=5Kd3KyfPT6740rvwZj4vy1yXsmjVhmaQ__RB8p5R5aE,1336
-users/tables.py,sha256=WwC7BMpzNrcfEatJj6gHMP8k_FGqer-Zfn9vZRB7kZo,2196
+users/tables.py,sha256=2HiDXa_4Hq1at86vfbhg1U3NobMjMWXTVQIJz3AizmQ,2088
 users/urls.py,sha256=FwQ9GVOBRQ4iXQ9UyLFI0aEAga0d5qL_miPNpmFPA-Q,1022
 users/views.py,sha256=oJLsr_G7TJP3Y6lRdkoP2oNVGe8tYD3x8I4ARO_iDA8,8730
 users/migrations/0001_initial.py,sha256=lx9sSKS-lxHhI6gelVH52NOkwqEMJ32TvOJUn9zaOXM,4709
@@ -13,16 +13,17 @@ users/migrations/0002_alter_useractivitylog_action.py,sha256=I7NLxgcPTslCMuADcr1
 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/user_activity_log.html,sha256=S_FDN6vVLz_mB826yjeU9vtVGtzk7E_LKBmQIeYtdkQ,611
+users/templates/user_activity_log.html,sha256=41G7Wjv8ehBTSALwLLVzzoIBIo5hSM3FOw36olDINF8,481
 users/templates/registration/login.html,sha256=owbzO_XjqMeSncwWxkTzsvbkhjEZd7LdbblC3HBnld0,4091
-users/templates/users/manage_users.html,sha256=71SIAF6xyyKa863yLmqCHaqbGwATmpVmXRVtpy_330M,2942
+users/templates/users/manage_users.html,sha256=qWmlIHeuxEldI2sc_ERedbxq5BtUyxtBbNt3MZ0qLyc,2801
 users/templates/users/profile.html,sha256=Ir8zvYUgDm89BlwVuuCsPJIVvTPa_2wH3HAaitPc4s8,2911
 users/templates/users/profile_edit.html,sha256=L9DUHlQHG-PmxwxBbSjgPk1dEmy0spPi6wXzT4hQe-U,4218
 users/templates/users/user_actions.html,sha256=J44-sn0fMbLUWjdtlcf5YhgT5OYRykr1mFkeVXoI1ew,1543
 users/templates/users/user_detail.html,sha256=QkJ-6jdtUdi8mM-V_MzqYcdoEkzXEsIeFMliNjgIOsc,2053
 users/templates/users/user_form.html,sha256=jcyI7OQZOY4ue4DajPtfjAt2SmAYO5ZgHNOqTp2-FO0,1352
-micro_users-1.3.1.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
-micro_users-1.3.1.dist-info/METADATA,sha256=IdsBDJU5IATuaw3bbwJyapchgPYJo2itC_-SnIZfubA,4363
-micro_users-1.3.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-micro_users-1.3.1.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
-micro_users-1.3.1.dist-info/RECORD,,
+users/templates/users/widgets/grouped_permissions.html,sha256=wXvV06qJO8-j7qFdyn5rnIEeMYn8ze_zQ9VfZS7Gj2k,9875
+micro_users-1.4.0.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
+micro_users-1.4.0.dist-info/METADATA,sha256=SJAjx3XI3jcv7nhmf6cnMvRqJysaDVfjGjDyY0XreDM,10059
+micro_users-1.4.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+micro_users-1.4.0.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
+micro_users-1.4.0.dist-info/RECORD,,

users/forms.py

@@ -12,14 +12,107 @@ from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 from django.db.models import Q
 
+
+from django.forms.widgets import ChoiceWidget
+
 User = get_user_model()
 
+class GroupedPermissionWidget(ChoiceWidget):
+    template_name = 'users/widgets/grouped_permissions.html'
+    allow_multiple_selected = True
+
+    def value_from_datadict(self, data, files, name):
+        if hasattr(data, 'getlist'):
+            return data.getlist(name)
+        return data.get(name)
+
+    def get_context(self, name, value, attrs):
+        from django.apps import apps
+        context = super().get_context(name, value, attrs)
+        
+        # Get current selected values (as strings/ints)
+        if value is None:
+            value = []
+        str_values = set(str(v) for v in value)
+        
+        # Access the queryset directly
+        qs = None
+        if hasattr(self.choices, 'queryset'):
+            qs = self.choices.queryset.select_related('content_type').order_by('content_type__app_label', 'codename')
+        else:
+             choices = list(self.choices)
+             choice_ids = [c[0] for c in choices if c[0]]
+             qs = Permissions.objects.filter(id__in=choice_ids).select_related('content_type').order_by('content_type__app_label', 'codename')
+
+        grouped_perms = {}
+        
+        for perm in qs:
+            app_label = perm.content_type.app_label
+            
+            # Fetch verbose app name
+            try:
+                app_config = apps.get_app_config(app_label)
+                app_verbose_name = app_config.verbose_name
+            except LookupError:
+                app_verbose_name = app_label.title()
+
+            # Determine action
+            action = 'other'
+            codename = perm.codename
+            if codename.startswith('view_'): action = 'view'
+            elif codename.startswith('change_'): action = 'change'
+            elif codename.startswith('add_'): action = 'add'
+            elif codename.startswith('delete_'): action = 'delete'
+            
+            # Build option dict
+            current_id = attrs.get('id', 'id_permissions') if attrs else 'id_permissions'
+
+            option = {
+                'name': name,
+                'value': perm.pk,
+                'label': str(perm), # Force string conversion to use custom __str__ method
+                'selected': str(perm.pk) in str_values,
+                'attrs': {
+                    'id': f"{current_id}_{perm.pk}",
+                    'data_action': action  # Critical for JS global select
+                }
+            }
+            
+            if app_label not in grouped_perms:
+                grouped_perms[app_label] = {
+                    'name': app_verbose_name,
+                    'actions': {}
+                }
+            
+            grouped_perms[app_label]['actions'].setdefault(action, []).append(option)
+            
+        context['widget']['grouped_perms'] = grouped_perms
+        return context
+
+    def render(self, name, value, attrs=None, renderer=None):
+        from django.template.loader import render_to_string
+        from django.utils.safestring import mark_safe
+        
+        context = self.get_context(name, value, attrs)
+        return mark_safe(render_to_string(self.template_name, context))
+
+
 # Custom User Creation form layout
 class CustomUserCreationForm(UserCreationForm):
     permissions = forms.ModelMultipleChoiceField(
-        queryset=Permissions.objects.all(),
+        queryset=Permissions.objects.exclude(
+            Q(codename__regex=r'^(delete_)') |
+            Q(content_type__app_label__in=[
+                'admin',
+                'auth',
+                'contenttypes',
+                'sessions',
+                'django_celery_beat',
+                'users'
+            ])
+        ),
         required=False,
-        widget=forms.CheckboxSelectMultiple,
+        widget=GroupedPermissionWidget,
         label="الصلاحيات"
     )
 
@@ -47,36 +140,6 @@ class CustomUserCreationForm(UserCreationForm):
         self.fields["password1"].help_text = "كلمة المرور يجب ألا تكون مشابهة لمعلوماتك الشخصية، وأن تحتوي على 8 أحرف على الأقل، وألا تكون شائعة أو رقمية بالكامل.."
         self.fields["password2"].help_text = "أدخل نفس كلمة المرور السابقة للتحقق."
 
-        # Split permissions queryset into two parts for 2 columns
-        permissions_list = list(Permissions.objects.exclude(
-            Q(codename__regex=r'^(delete_)') |
-            Q(content_type__app_label__in=[
-                'admin',
-                'auth',
-                'contenttypes',
-                'sessions',
-                'django_celery_beat',
-                'users'
-            ])
-        ))
-        mid_point = len(permissions_list) // 2
-        permissions_right = permissions_list[:mid_point]
-        permissions_left = permissions_list[mid_point:]
-
-        # Create two fields with only one column of permissions each
-        self.fields["permissions_right"] = forms.ModelMultipleChoiceField(
-            queryset=Permissions.objects.filter(id__in=[p.id for p in permissions_right]),
-            required=False,
-            widget=forms.CheckboxSelectMultiple,
-            label="الصلاحيـــات"
-        )
-        self.fields["permissions_left"] = forms.ModelMultipleChoiceField(
-            queryset=Permissions.objects.filter(id__in=[p.id for p in permissions_left]),
-            required=False,
-            widget=forms.CheckboxSelectMultiple,
-            label=""
-        )
-
         # Use Crispy Forms Layout helper
         self.helper = FormHelper()
         self.helper.layout = Layout(
@@ -96,11 +159,7 @@ class CustomUserCreationForm(UserCreationForm):
                 css_class="row"
             ),
             HTML("<hr>"),
-            Div(
-                Div(Field("permissions_right", css_class="col-md-6"), css_class="col-md-6"),
-                Div(Field("permissions_left", css_class="col-md-6"), css_class="col-md-6"),
-                css_class="row"
-            ),
+            Field("permissions", css_class="col-12"),
             "is_staff",
             "is_active",
             FormActions(
@@ -126,17 +185,27 @@ class CustomUserCreationForm(UserCreationForm):
         user = super().save(commit=False)
         if commit:
             user.save()
-        # Manually set permissions from both fields
-        user.user_permissions.set(self.cleaned_data["permissions_left"] | self.cleaned_data["permissions_right"])
+        # Manually set permissions
+        user.user_permissions.set(self.cleaned_data["permissions"])
         return user
 
 
 # Custom User Editing form layout
 class CustomUserChangeForm(UserChangeForm):
     permissions = forms.ModelMultipleChoiceField(
-        queryset=Permissions.objects.all(),
+        queryset=Permissions.objects.exclude(
+            Q(codename__regex=r'^(delete_)') |
+            Q(content_type__app_label__in=[
+                'admin',
+                'auth',
+                'contenttypes',
+                'sessions',
+                'django_celery_beat',
+                'users'
+            ])
+        ),
         required=False,
-        widget=forms.CheckboxSelectMultiple,
+        widget=GroupedPermissionWidget,
         label="الصلاحيات"
     )
 
@@ -162,48 +231,8 @@ class CustomUserChangeForm(UserChangeForm):
         self.fields["is_staff"].help_text = "يحدد ما إذا كان بإمكان المستخدم الوصول إلى قسم ادارة المستخدمين."
         self.fields["is_active"].help_text = "يحدد ما إذا كان يجب اعتبار هذا الحساب نشطًا. قم بإلغاء تحديد هذا الخيار بدلاً من الحذف."
         
-        # Split permissions queryset into two parts for 2 columns
-        permissions_list = list(Permissions.objects.exclude(
-            Q(codename__regex=r'^(delete_)') |
-            Q(content_type__app_label__in=[
-                'admin',
-                'auth',
-                'contenttypes',
-                'sessions',
-                'django_celery_beat',
-                'users'
-            ])
-        ))
-        mid_point = len(permissions_list) // 2
-        self.permissions_right = permissions_list[:mid_point]
-        self.permissions_left = permissions_list[mid_point:]
-
-        # Get user's current permissions
         if user:
-            user_permissions = set(user.user_permissions.all())
-
-            # Set initial values based on user's existing permissions
-            initial_right = [p.id for p in self.permissions_right if p in user_permissions]
-            initial_left = [p.id for p in self.permissions_left if p in user_permissions]
-        else:
-            initial_right = []
-            initial_left = []
-
-        # Create two fields with only one column of permissions each
-        self.fields["permissions_right"] = forms.ModelMultipleChoiceField(
-            queryset=Permissions.objects.filter(id__in=[p.id for p in self.permissions_right]),
-            required=False,
-            widget=forms.CheckboxSelectMultiple,
-            label="الصلاحيـــات",
-            initial=initial_right
-        )
-        self.fields["permissions_left"] = forms.ModelMultipleChoiceField(
-            queryset=Permissions.objects.filter(id__in=[p.id for p in self.permissions_left]),
-            required=False,
-            widget=forms.CheckboxSelectMultiple,
-            label="",
-            initial=initial_left
-        )
+            self.fields["permissions"].initial = user.user_permissions.all()
 
         # Use Crispy Forms Layout helper
         self.helper = FormHelper()
@@ -223,11 +252,7 @@ class CustomUserChangeForm(UserChangeForm):
                 css_class="row"
             ),
             HTML("<hr>"),
-            Div(
-                Div(Field("permissions_right", css_class="col-md-6"), css_class="col-md-6"),
-                Div(Field("permissions_left", css_class="col-md-6"), css_class="col-md-6"),
-                css_class="row"
-            ),
+            Field("permissions", css_class="col-12"),
             "is_staff",
             "is_active",
             FormActions(
@@ -261,8 +286,8 @@ class CustomUserChangeForm(UserChangeForm):
         user = super().save(commit=False)
         if commit:
             user.save()
-        # Manually set permissions from both fields
-        user.user_permissions.set(self.cleaned_data["permissions_left"] | self.cleaned_data["permissions_right"])
+        # Manually set permissions
+        user.user_permissions.set(self.cleaned_data["permissions"])
         return user
 
 

users/tables.py

@@ -1,5 +1,3 @@
-# Imports of the required python modules and libraries
-######################################################
 import django_tables2 as tables
 from django.contrib.auth import get_user_model
 from .models import UserActivityLog
@@ -9,7 +7,11 @@ User = get_user_model()  # Use custom user model
 class UserTable(tables.Table):
     username = tables.Column(verbose_name="اسم المستخدم")
     email = tables.Column(verbose_name="البريد الالكتروني")
-    full_name = tables.Column(verbose_name="الاسم بالكامل", orderable=False,)
+    full_name = tables.Column(
+        verbose_name="الاسم الكامل",
+        accessor='user.full_name',
+        order_by='user__first_name'
+    )
     is_staff = tables.BooleanColumn(verbose_name="مسؤول")
     is_active = tables.BooleanColumn(verbose_name="نشط")
     last_login = tables.DateColumn(
@@ -22,7 +24,6 @@ class UserTable(tables.Table):
         orderable=False,
         verbose_name=''
     )
-
     class Meta:
         model = User
         template_name = "django_tables2/bootstrap5.html"
@@ -30,13 +31,12 @@ class UserTable(tables.Table):
         attrs = {'class': 'table table-hover align-middle'}
 
 class UserActivityLogTable(tables.Table):
-    user = tables.Column(verbose_name="اسم الدخول")
     timestamp = tables.DateColumn(
         format="H:i Y-m-d ",  # This is the format you want for the timestamp
         verbose_name="وقت العملية"
     )
     full_name = tables.Column(
-        verbose_name="الاسم بالكامل",
+        verbose_name="الاسم الكامل",
         accessor='user.full_name',
         order_by='user__first_name'
     )

users/templates/user_activity_log.html

@@ -1,19 +1,17 @@
 {% extends "base.html" %}
 {% load django_tables2 %}
 {% load crispy_forms_tags %}
+
 {% block title %}الاعدادت - السجل{% endblock %}
 
 {% block content %}
 
-<form method="get" class="py-3 row g-2 no-print m-0">
-    {% crispy filter.form %}
-</form>
+    <form method="get" class="py-3 g-2 no-print m-0">
+        {% crispy filter.form %}
+    </form>
 
     <div class="card border-light shadow">
-        <!-- <div class="card-header text-center pe-5 text-bg-warning">
-            <h3 class="card-title">السجل</h3>
-        </div> -->
-        <div class="card-body p-0 table-responsive">
+        <div class="card-body p-0 table-responsive-lg">
             <!-- Render the table -->
             {% render_table table %}
         </div>

users/templates/users/manage_users.html

@@ -6,14 +6,11 @@
 
 {% block content %}
 
-    <form method="get" class="mb-3">
+    <form method="get" class="py-3 g-2 no-print">
         {% crispy filter.form %}
     </form>
 
     <div class="card border-light shadow">
-        <!-- <div class="card-header text-center pe-5 text-bg-warning">
-            <h3 class="card-title">إدارة المستخدمين</h3>
-        </div> -->
         <div class="card-body p-0 table-responsive-lg">
             <!-- Render the table -->
             {% render_table table %}
@@ -21,7 +18,7 @@
     </div>
 
     <div class="mt-3">
-        <a href="{% url 'create_user' %}" class="btn btn-secondary" title="إضافة مستخدم جديد">
+        <a href="{% url 'create_user' %}" class="btn btn-secondary no-print" title="إضافة مستخدم جديد">
             <i class="bi bi-person-plus-fill text-light me-1 h4"></i> إضافة مستخدم جديد
         </a>
     </div>

users/templates/users/widgets/grouped_permissions.html

@@ -0,0 +1,210 @@
+{% with id=widget.attrs.id %}
+<div class="grouped-permissions-widget" id="{{ id }}_container">
+    
+    <!-- Top Bar: Global Controls -->
+    <div class="card mb-3 shadow-sm">
+        <div class="card-body d-flex justify-content-between align-items-center flex-wrap gap-2">
+            <div class="form-check form-check-inline">
+                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_view" data-action-target="view">
+                <label class="form-check-label fw-bold" for="{{ id }}_global_view">عرض الكل</label>
+            </div>
+            <div class="form-check form-check-inline">
+                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_change" data-action-target="change">
+                <label class="form-check-label fw-bold" for="{{ id }}_global_change">تعديل الكل</label>
+            </div>
+            <div class="form-check form-check-inline">
+                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_add" data-action-target="add">
+                <label class="form-check-label fw-bold" for="{{ id }}_global_add">إضافة الكل</label>
+            </div>
+            <div class="form-check form-check-inline">
+                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_other" data-action-target="other">
+                <label class="form-check-label fw-bold" for="{{ id }}_global_other">الأخرى</label>
+            </div>
+            
+            <button type="button" class="btn btn-outline-primary ms-auto" data-bs-toggle="collapse" 
+                    data-bs-target="#{{ id }}_detailed_list" aria-expanded="false" aria-controls="{{ id }}_detailed_list">
+                <i class="bi bi-list-check"></i> إظهار التفاصيل
+            </button>
+        </div>
+    </div>
+
+    <!-- Collapsible Detailed List -->
+    <div class="collapse" id="{{ id }}_detailed_list">
+        {% for app_label, app_data in widget.grouped_perms.items %}
+        <div class="card mb-3">
+            <div class="card-header bg-light">
+                <h5 class="mb-0 text-capitalize">{{ app_data.name }}</h5>
+            </div>
+            <div class="card-body">
+                {% for action_name, options in app_data.actions.items %}
+                <div class="permission-group mb-2 pb-2 border-bottom">
+                    <div class="d-flex align-items-center mb-2">
+                        <div class="form-check">
+                            <input type="checkbox" class="form-check-input group-checkbox" 
+                                   id="{{ id }}_{{ app_label }}_{{ action_name }}_all"
+                                   data-group-target="{{ id }}_{{ app_label }}_{{ action_name }}_group">
+                            <label class="form-check-label fw-bold" for="{{ id }}_{{ app_label }}_{{ action_name }}_all">
+                            {% if action_name == 'view' %}
+                                مشاهدة الكل ({{ options|length }})
+                            {% elif action_name == 'change' %}
+                                تعديل الكل ({{ options|length }})
+                            {% elif action_name == 'add' %}
+                                إضافة الكل ({{ options|length }})
+                            {% elif action_name == 'delete' %}
+                                حذف الكل ({{ options|length }})
+                            {% else %}
+                                {{ action_name|title }} الكل ({{ options|length }})
+                            {% endif %}
+                            </label>
+                        </div>
+                    </div>
+
+                    <div class="row row-cols-1 row-cols-md-2 g-2 ps-4 {{ id }}_{{ app_label }}_{{ action_name }}_group">
+                        {% for option in options %}
+                        <div class="col">
+                            <div class="form-check">
+                                <input type="checkbox" name="{{ option.name }}" value="{{ option.value }}" 
+                                       class="form-check-input permission-checkbox" 
+                                       id="{{ option.attrs.id }}"
+                                       data-action="{{ option.attrs.data_action }}"
+                                       {% if option.selected %}checked{% endif %}>
+                                <label class="form-check-label" for="{{ option.attrs.id }}">
+                                    {{ option.label }}
+                                </label>
+                            </div>
+                        </div>
+                        {% endfor %}
+                    </div>
+                </div>
+                {% endfor %}
+            </div>
+        </div>
+        {% endfor %}
+    </div>
+</div>
+
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+    const container = document.getElementById('{{ id }}_container');
+    console.log('Grouped Permissions Widget Initialized');
+    
+    // --- Helper Functions ---
+
+    // Update a specific App-level Master checkbox (e.g. Users->View All)
+    function updateAppGroupMaster(groupContainer) {
+        if (!groupContainer) return;
+        
+        const parentGroupDiv = groupContainer.closest('.permission-group');
+        if (!parentGroupDiv) return;
+
+        const masterCb = parentGroupDiv.querySelector('.group-checkbox');
+        if (masterCb) {
+            const allChildren = groupContainer.querySelectorAll('.permission-checkbox');
+            const total = allChildren.length;
+            let checkedCount = 0;
+            for (let i = 0; i < total; i++) {
+                if (allChildren[i].checked) checkedCount++;
+            }
+
+            masterCb.checked = (total > 0 && checkedCount === total);
+            masterCb.indeterminate = (checkedCount > 0 && checkedCount < total);
+        }
+    }
+
+    // Update ALL App-level Masters (useful after a global bulk change)
+    function updateAllAppMasters() {
+        const allGroupContainers = container.querySelectorAll('div[class*="_group"]');
+        allGroupContainers.forEach(groupContainer => {
+            updateAppGroupMaster(groupContainer);
+        });
+    }
+
+    // Update Global Masters (Top Bar)
+    function updateGlobalMasters() {
+        const globalSelectors = container.querySelectorAll('.global-select');
+        globalSelectors.forEach(globalCb => {
+            const actionTarget = globalCb.getAttribute('data-action-target');
+            const allTargets = container.querySelectorAll(`.permission-checkbox[data-action="${actionTarget}"]`);
+            
+            if (allTargets.length > 0) {
+                 const total = allTargets.length;
+                 let checkedCount = 0;
+                 for (let i = 0; i < total; i++) {
+                     if (allTargets[i].checked) checkedCount++;
+                 }
+
+                 globalCb.checked = (checkedCount === total);
+                 globalCb.indeterminate = (checkedCount > 0 && checkedCount < total);
+            }
+        });
+    }
+
+    // --- Global Selectors (Top Bar) Logic ---
+    const globalSelectors = container.querySelectorAll('.global-select');
+    globalSelectors.forEach(globalCb => {
+        globalCb.addEventListener('change', function() {
+            try {
+                const actionTarget = this.getAttribute('data-action-target');
+                const isChecked = this.checked;
+                console.log('Global Click:', actionTarget, isChecked);
+                
+                // 1. Bulk update all target children directly (No event dispatch)
+                const targetCheckboxes = container.querySelectorAll(`.permission-checkbox[data-action="${actionTarget}"]`);
+                targetCheckboxes.forEach(cb => {
+                    cb.checked = isChecked;
+                });
+
+                // 2. Update all App-level masters to reflect the change
+                updateAllAppMasters();
+                
+            } catch (e) {
+                console.error('Error in Global Select:', e);
+            }
+        });
+    });
+
+    // --- Sub-Group Masters (App Level) Logic ---
+    const groupCheckboxes = container.querySelectorAll('.group-checkbox');
+    groupCheckboxes.forEach(cb => {
+        cb.addEventListener('change', function() {
+            try {
+                const isChecked = this.checked;
+                const permissionGroup = this.closest('.permission-group');
+                if (!permissionGroup) return;
+
+                const targetGroup = permissionGroup.querySelector('div[class*="_group"]');
+                if (targetGroup) {
+                    // 1. Bulk update children directly
+                    const childCheckboxes = targetGroup.querySelectorAll('.permission-checkbox');
+                    childCheckboxes.forEach(child => {
+                        child.checked = isChecked;
+                    });
+                    
+                    // 2. Update Global Masters since the counts changed
+                    updateGlobalMasters();
+                }
+            } catch (e) {
+                console.error('Error in SubGroup Select:', e);
+            }
+        });
+    });
+
+    // --- Individual Permission Logic ---
+    const permissionCheckboxes = container.querySelectorAll('.permission-checkbox');
+    permissionCheckboxes.forEach(cb => {
+        cb.addEventListener('change', function() {
+            // Update the specific App Group Master this belongs to
+            const groupContainer = this.closest('div[class*="_group"]');
+            updateAppGroupMaster(groupContainer);
+            
+            // Update Global Masters
+            updateGlobalMasters();
+        });
+    });
+
+    // --- Initial State Hydration ---
+    updateAllAppMasters();
+    updateGlobalMasters();
+});
+</script>
+{% endwith %}

micro_users-1.3.1.dist-info/METADATA

@@ -1,133 +0,0 @@
-Metadata-Version: 2.1
-Name: micro-users
-Version: 1.3.1
-Summary: Arabic Django user management app with abstract user, permissions, and activity logging
-Home-page: https://github.com/debeski/micro-users
-Author: DeBeski
-Author-email: DeBeski <debeski1@gmail.com>
-License: MIT
-Keywords: django,users,permissions,authentication
-Classifier: Framework :: Django
-Classifier: Framework :: Django :: 5
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: Django (>=5.1)
-Requires-Dist: django-crispy-forms (>=2.4)
-Requires-Dist: django-tables2 (>=2.7)
-Requires-Dist: django-filter (>=24.3)
-Requires-Dist: pillow (>=11.0)
-Requires-Dist: babel (>=2.1)
-
-# Micro Users - Arabic Django User Management App
-
-[![PyPI version](https://badge.fury.io/py/micro-users.svg)](https://pypi.org/project/micro-users/)
-
-**Arabic** lightweight, reusable Django app providing user management with abstract user, permissions, localization, and activity logging.
-
-
-## Requirements
-- **Must be installed on a fresh database.**
-- Python 3.11+
-- Django 5.1+
-- django-crispy-forms 2.4+
-- django-tables2 2.7+
-- django-filter 24.3+
-- pillow 11.0+
-- babel 2.1+
-
-
-## Features
-- Custom AbstractUser model
-- User permissions system  
-- Activity logging (login/logout, CRUD tracking)
-- Specific User detail and log view *new*
-- Localization support
-- Admin interface integration
-- CRUD views and templates
-- Filtering and tabulation
-
-## Installation
-
-```bash
-pip install git+https://github.com/debeski/micro-users.git
-# OR local
-pip install micro-users
-```
-
-## Configuration
-
-1. Add to `INSTALLED_APPS`:
-```python
-INSTALLED_APPS = [
-    'users',  # Preferably on top
-    'django.contrib.admin',
-    'django.contrib.auth',
-    ...
-]
-```
-
-2. Set custom user model in settings.py:
-```python
-AUTH_USER_MODEL = 'users.CustomUser'
-```
-
-3. Include URLs in your main project folder `urls.py`:
-```python
-urlpatterns = [
-    ...
-    path('manage/', include('users.urls')),
-]
-```
-
-4. Run migrations:
-```bash
-python manage.py migrate users
-```
-
-
-## Structure
-```
-users/
-├── views.py        # CRUD operations
-├── urls.py         # URL routing
-├── tables.py       # User and Activity Log tables
-├── signals.py      # Logging signals
-├── models.py       # User model, permissions, activity logs
-├── forms.py        # Creation, edit,. etc.
-├── filter.py       # Search filters
-├── apps.py         # Permissions Localization
-├── admin.py        # Admin UI integration
-├── __init__.py     # Python init
-├── templates/      # HTML templates
-├── static/         # CSS classes
-└── 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 minor import bug |
-| v1.2.3   | • Separated user detail view from table for consistency<br> • Optimized the new detail + log view for optimal compatibiliyy with users |
-| v1.2.4   | • Fixed a couple of visual inconsistencies |
-| v1.3.0   | • Patched a critical security permission issue<br> • Disabled ADMIN from being viewed/edited from other staff members<br> • Fixed an issue when sorting with full_name<br> • Enabled Logging for all actions |
-| v1.3.1   | • replaced a misplaced code that caused a crash when editing profile |