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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micro-users
-Version: 1.0.4
+Version: 1.1.1
 Summary: Arabic Django user management app with abstract user, permissions, and activity logging
 Home-page: https://github.com/debeski/micro-users
 Author: DeBeski
@@ -15,6 +15,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
@@ -36,7 +38,7 @@ Requires-Dist: babel (>=2.1)
 
 ## Requirements
 - **Must be installed on a fresh database.**
-- Python 3.9+
+- Python 3.11+
 - Django 5.1+
 - django-crispy-forms 2.4+
 - django-tables2 2.7+
@@ -48,7 +50,7 @@ Requires-Dist: babel (>=2.1)
 ## Features
 - Custom AbstractUser model
 - User permissions system  
-- Activity logging (login/logout tracking)
+- Activity logging (login/logout, CRUD tracking)
 - Localization support
 - Admin interface integration
 - CRUD views and templates
@@ -87,9 +89,8 @@ urlpatterns = [
 ]
 ```
 
-4. make migrations and migrate:
+4. Run migrations:
 ```bash
-python manage.py makemigrations users
 python manage.py migrate users
 ```
 

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

@@ -2,7 +2,7 @@ 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=9-yrWBF-CdWb1nrAhmifWb1AHI0z4LQma1uR_9jLr2U,4797
-users/forms.py,sha256=q3kVpGKEunYXuGNSBl3h_I-Q8hdD_7nru1lx9vMGoLA,18356
+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
@@ -10,16 +10,15 @@ users/urls.py,sha256=gmk_ZkSg9Bj-fUpIRACL_X7MEADTgZ7uvmbvXoAo5fo,956
 users/views.py,sha256=yfzWkIDha66YK-Rgz7GH7MhQsupSCojf59C7fBqkppI,7209
 users/migrations/0001_initial.py,sha256=lx9sSKS-lxHhI6gelVH52NOkwqEMJ32TvOJUn9zaOXM,4709
 users/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-users/static/css/login.css,sha256=SiJ6jBbWQAP2Nxt7DOTZbTcFYP9JEp557AuQZ9Eirb0,2120
 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/profile.html,sha256=9ahVF6YZUR-6-c8SKc0rN2pVdis2lI9gbcOQZeMaFnY,2909
 users/templates/users/profile_edit.html,sha256=sgO3h9ffVK1vnDNl4E6l5x3xfam3FTQl6Lqkrw5gmlw,4215
-users/templates/users/user_actions.html,sha256=33y-aFqzsFm7yMSzBFGtuT-95hhyQV8CFppU3Oev54A,1366
+users/templates/users/user_actions.html,sha256=kuNMZBK9qwrLDU6hhp836Ru_yGVOr-uAeoJBJsZtzP8,1386
 users/templates/users/user_form.html,sha256=jcyI7OQZOY4ue4DajPtfjAt2SmAYO5ZgHNOqTp2-FO0,1352
-micro_users-1.0.4.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
-micro_users-1.0.4.dist-info/METADATA,sha256=ZYaBLfA_0F77-aLgWZ5yMgFgLhoWtNzRdIyLn0sQLyg,2749
-micro_users-1.0.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-micro_users-1.0.4.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
-micro_users-1.0.4.dist-info/RECORD,,
+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,,

users/forms.py

@@ -10,6 +10,7 @@ from crispy_forms.bootstrap import FormActions
 from PIL import Image
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
+from django.db.models import Q
 
 User = get_user_model()
 
@@ -48,28 +49,15 @@ class CustomUserCreationForm(UserCreationForm):
 
         # Split permissions queryset into two parts for 2 columns
         permissions_list = list(Permissions.objects.exclude(
-            codename__in=[
-                'add_logentry', 'change_logentry', 'delete_logentry', 'view_logentry',
-                'add_theme', 'change_theme', 'delete_theme', 'view_theme',
-                'add_group', 'change_group', 'delete_group', 'view_group',
-                'add_permission', 'change_permission', 'delete_permission', 'view_permission',
-                'add_permissions', 'change_permissions', 'delete_permissions', 'view_permissions',
-                'add_contenttype', 'change_contenttype', 'delete_contenttype', 'view_contenttype',
-                'add_session', 'change_session', 'delete_session', 'view_session',
-                'add_government', 'delete_government', 'view_government',
-                'add_minister', 'delete_minister', 'view_minister',
-                'add_decreecategory', 'delete_decreecategory', 'view_decreecategory',
-                'add_periodictask', 'change_periodictask', 'delete_periodictask', 'view_periodictask',
-                'add_periodictasks', 'change_periodictasks', 'delete_periodictasks', 'view_periodictasks',
-                'add_clockedschedule', 'change_clockedschedule', 'delete_clockedschedule', 'view_clockedschedule',
-                'add_crontabschedule', 'change_crontabschedule', 'delete_crontabschedule', 'view_crontabschedule',
-                'add_intervalschedule', 'change_intervalschedule', 'delete_intervalschedule', 'view_intervalschedule',
-                'add_solarschedule', 'change_solarschedule', 'delete_solarschedule', 'view_solarschedule',
-                'add_customuser', 'change_customuser', 'delete_customuser', 'view_customuser',
-                'add_useractivitylog', 'change_useractivitylog', 'delete_useractivitylog', 'view_useractivitylog',
-                'download_doc', 'gen_pub_pdf', 'download_doc', 'delete_decree', 'delete_publication', 'delete_objection',
-                'delete_formplus', 'view_decree', 'view_formplus', 'gen_pub_pdf', 'view_publication',
-            ]
+            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]
@@ -176,28 +164,15 @@ class CustomUserChangeForm(UserChangeForm):
         
         # Split permissions queryset into two parts for 2 columns
         permissions_list = list(Permissions.objects.exclude(
-            codename__in=[
-                'add_logentry', 'change_logentry', 'delete_logentry', 'view_logentry',
-                'add_theme', 'change_theme', 'delete_theme', 'view_theme',
-                'add_group', 'change_group', 'delete_group', 'view_group',
-                'add_permission', 'change_permission', 'delete_permission', 'view_permission',
-                'add_permissions', 'change_permissions', 'delete_permissions', 'view_permissions',
-                'add_contenttype', 'change_contenttype', 'delete_contenttype', 'view_contenttype',
-                'add_session', 'change_session', 'delete_session', 'view_session',
-                'add_government', 'delete_government', 'view_government',
-                'add_minister', 'delete_minister', 'view_minister',
-                'add_decreecategory', 'delete_decreecategory', 'view_decreecategory',
-                'add_periodictask', 'change_periodictask', 'delete_periodictask', 'view_periodictask',
-                'add_periodictasks', 'change_periodictasks', 'delete_periodictasks', 'view_periodictasks',
-                'add_clockedschedule', 'change_clockedschedule', 'delete_clockedschedule', 'view_clockedschedule',
-                'add_crontabschedule', 'change_crontabschedule', 'delete_crontabschedule', 'view_crontabschedule',
-                'add_intervalschedule', 'change_intervalschedule', 'delete_intervalschedule', 'view_intervalschedule',
-                'add_solarschedule', 'change_solarschedule', 'delete_solarschedule', 'view_solarschedule',
-                'add_customuser', 'change_customuser', 'delete_customuser', 'view_customuser',
-                'add_useractivitylog', 'change_useractivitylog', 'delete_useractivitylog', 'view_useractivitylog',
-                'download_doc', 'gen_pub_pdf', 'download_doc', 'delete_decree', 'delete_publication', 'delete_objection',
-                'delete_formplus', 'view_decree', 'view_formplus', 'gen_pub_pdf', 'view_publication',
-            ]
+            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]

users/templates/users/user_actions.html

@@ -9,20 +9,20 @@
                     <i class="bi bi-person-lines-fill text-dark me-1 h5"> </i> عرض
                 </a>
             </li> {% endcomment %}
+            {% if not record.is_superuser %}
             <li>
                 <a class="dropdown-item" href="{% url 'edit_user' record.id %}" title="تعديل">
                     <i class="bi bi-person-dash-fill text-dark me-1 h5"> </i> تعديل
                 </a>
             </li>
-            {% if user.is_superuser %}
-                {% if not record.is_staff %}
+            {% endif %}
+            {% 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 }}">
                 <i class="bi bi-x-octagon text-danger me-1 h5"> </i> حذف
                 </a>
             </li>
-                {% endif %}
             {% endif %}
         </ul>
     </div>

users/static/css/login.css

@@ -1,134 +0,0 @@
-::selection {
-  background: #d4c591;
-}
-::-webkit-selection {
-  background: #d4c591;
-}
-::-moz-selection {
-  background: #c9aa5e;
-}
-
-.page {
-  display: flex;
-  flex-direction: column;
-  height: calc(100% - 15vh);
-  position: absolute;
-  place-content: center;
-  width: calc(100% - 40px);
-}
-@media (max-width: 767px) {
-  .page {
-    height: auto;
-    margin-bottom: 20px;
-    padding-bottom: 20px;
-  }
-}
-.container {
-  height: 320px;
-  margin: 0 auto;
-  width: 640px;
-}
-@media (max-width: 767px) {
-  .container {
-    flex-direction: column;
-    height: 630px;
-    width: 320px;
-  }
-}
-.left {
-  background: white;
-  height: calc(100% - 40px);
-  top: 20px;
-  position: relative;
-  width: 60%;
-  box-shadow: 0px 0px 10px 4px rgba(0,0,0,0.03);
-
-}
-@media (max-width: 767px) {
-  .left {
-    height: 100%;
-    left: 5%;
-    width: 110%;
-    max-height: 270px;
-  }
-}
-/* .login {
-  font-size: 38px;
-  font-weight: 600;
-}
-.eula {
-  color: #adadad;
-  font-size: 14px;
-  line-height: 1.5;
-  margin: 40px;
-} */
-.right {
-  background: #cb9447;
-  box-shadow: 0px 0px 20px 8px rgba(0,0,0,0.07);
-  color: #F1F1F2;
-  position: relative;
-  width: 58%;
-}
-@media (max-width: 767px) {
-  .right {
-    flex-shrink: 0;
-    height: 100%;
-    width: 100%;
-    max-height: 350px;
-  }
-}
-svg {
-  position: absolute;
-  width: 320px;
-}
-path {
-  fill: none;
-  stroke: url(#linearGradient);;
-  stroke-width: 3;
-  stroke-dasharray: 240 1386;
-}
-.form {
-  margin: 35px 35px 35px 20px;
-  position: absolute;
-}
-label {
-  color:  #c2c2c5;
-  display: block;
-  font-size: 14px;
-  height: 16px;
-  margin-top: 20px;
-  margin-bottom: 5px;
-}
-input {
-  background: transparent;
-  border: 0;
-  color: #2d0202;
-  font-size: 20px;
-  height: 30px;
-  line-height: 30px;
-  outline: none !important;
-  width: 100%;
-  margin-top: 30px;
-  margin-bottom: 10px;
-}
-input::-moz-focus-inner { 
-  border: 0; 
-}
-#submit {
-  color: #707075;
-  margin-top: 40px;
-  transition: color 300ms;
-}
-#submit:focus {
-  color: #575757;
-} 
-#submit:active {
-  color: #4d4d4d;
-}
-
-.titlebar {
-  background-color: var(--title);
-  flex-direction: row;
-  height: 7vh;
-  justify-content: center !important
-}