From f8f3a4f3c908b35df08576a2b3db5e5a501e17b2 Mon Sep 17 00:00:00 2001
From: Horilla <support@horilla.com>
Date: Thu, 1 May 2025 17:40:30 +0530
Subject: [PATCH] [UPDT] BASE: Updated base app by adding NO_PERMISSION_MODALS
 varriable to context on def employee_permission_assign(request) function

---
 .../base/auth/permission_accordion.html       |  4 +-
 .../base/auth/permission_assign.html          |  2 +-
 base/views.py                                 | 61 ++++++++++---------
 .../templates/tabs/group_permissions.html     |  5 +-
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/base/templates/base/auth/permission_accordion.html b/base/templates/base/auth/permission_accordion.html
index 442ce38a8..5375160fd 100644
--- a/base/templates/base/auth/permission_accordion.html
+++ b/base/templates/base/auth/permission_accordion.html
@@ -28,7 +28,9 @@
     </div>
 </div>
 <div id="permissionContainer">
-    {% include "base/auth/permission_lines.html" %}
+    <span hx-get="{% url 'permission-search' %}" hx-swap="outerHTML" hx-trigger="load" >
+        <div class="animated-background"></div>
+    </span>
 </div>
 <div class="oh-modal" id="Permissions" role="dialog" aria-labelledby="Permissions" aria-hidden="true">
     <div class="oh-modal__dialog" style="max-width: 880px">
diff --git a/base/templates/base/auth/permission_assign.html b/base/templates/base/auth/permission_assign.html
index 572cf1c98..00015fbf8 100644
--- a/base/templates/base/auth/permission_assign.html
+++ b/base/templates/base/auth/permission_assign.html
@@ -5,7 +5,7 @@
 <div class="oh-input-group mb-2">
   {{form.employee.errors}} {{form.employee}}
 </div>
-{{form.permission.errors}}
+{{form.permissions.errors}}
 <div id="permTable">{% include "base/auth/permission_table.html" %}</div>
 
 <div class="d-flex flex-row-reverse mt-3">
diff --git a/base/views.py b/base/views.py
index 149402e8a..09e823da1 100644
--- a/base/views.py
+++ b/base/views.py
@@ -3293,33 +3293,31 @@ def employee_permission_assign(request):
 
     context = {}
     template = "base/auth/permission.html"
-    if request.GET.get("profile_tab"):
+    if request.GET.get("profile_tab") and request.GET.get("employee_id"):
         template = "tabs/group_permissions.html"
-        employees = Employee.objects.filter(id=request.GET["employee_id"]).distinct()
-        emoloyee = employees.first()
-        context["employee"] = emoloyee
+        employees = Employee.objects.filter(id=request.GET["employee_id"])
+        context["employee"] = employees.first()
     else:
         employees = Employee.objects.filter(
             employee_user_id__user_permissions__isnull=False
         ).distinct()
         context["show_assign"] = True
-    permissions = []
-    no_permission_models = NO_PERMISSION_MODALS
-    for app_name in APPS:
-        app_models = []
-        for model in get_models_in_app(app_name):
-            if model._meta.model_name not in no_permission_models:
-                app_models.append(
-                    {
-                        "verbose_name": model._meta.verbose_name.capitalize(),
-                        "model_name": model._meta.model_name,
-                    }
-                )
-        permissions.append(
-            {"app": app_name.capitalize().replace("_", " "), "app_models": app_models}
-        )
+    permissions = [
+        {
+            "app": app_name.capitalize().replace("_", " "),
+            "app_models": [
+                {
+                    "verbose_name": model._meta.verbose_name.capitalize(),
+                    "model_name": model._meta.model_name,
+                }
+                for model in get_models_in_app(app_name)
+                if model._meta.model_name not in NO_PERMISSION_MODALS
+            ],
+        }
+        for app_name in APPS
+    ]
     context["permissions"] = permissions
-    context["no_permission_models"] = no_permission_models
+    context["no_permission_models"] = NO_PERMISSION_MODALS
     context["employees"] = paginator_qry(employees, request.GET.get("page"))
     return render(
         request,
@@ -3338,26 +3336,29 @@ def employee_permission_search(request, codename=None, uid=None):
     template = "base/auth/permission_lines.html"
     employees = EmployeeFilter(request.GET).qs
     if request.GET.get("profile_tab"):
-        template = "base/auth/permission_accordion.html"
-        employees = employees.filter(id=request.GET["employee_id"]).distinct()
+        employees = Employee.objects.filter(id=request.GET["employee_id"])
+        context["employee"] = employees.first()
     else:
         employees = employees.filter(
             employee_user_id__user_permissions__isnull=False
         ).distinct()
         context["show_assign"] = True
-    permissions = []
-    apps = APPS
-    for app_name in apps:
-        app_models = []
-        for model in get_models_in_app(app_name):
-            app_models.append(
+    permissions = [
+        {
+            "app": app_name.capitalize().replace("_", " "),
+            "app_models": [
                 {
                     "verbose_name": model._meta.verbose_name.capitalize(),
                     "model_name": model._meta.model_name,
                 }
-            )
-        permissions.append({"app": app_name.capitalize(), "app_models": app_models})
+                for model in get_models_in_app(app_name)
+                if model._meta.model_name not in NO_PERMISSION_MODALS
+            ],
+        }
+        for app_name in APPS
+    ]
     context["permissions"] = permissions
+    context["no_permission_models"] = NO_PERMISSION_MODALS
     context["employees"] = paginator_qry(employees, request.GET.get("page"))
     return render(
         request,
diff --git a/employee/templates/tabs/group_permissions.html b/employee/templates/tabs/group_permissions.html
index 368cab338..4b382414f 100644
--- a/employee/templates/tabs/group_permissions.html
+++ b/employee/templates/tabs/group_permissions.html
@@ -3,7 +3,10 @@
 <div class="oh-tabs__contents">
     <div class="oh-tabs__content oh-tabs__content--active" id="tab_1_permission">
         {% if employee %}
-        {% include "base/auth/permission_accordion.html" %}
+            <div class="oh-inner-sidebar-content__header d-flex justify-content-between align-items-center">
+                <h2 class="oh-inner-sidebar-content__title">{% trans "Employee Permissions" %}</h2>
+            </div>
+            {% include "base/auth/permission_lines.html" %}
         {% else %}
         {% include "base/auth/permission_table.html" %}
         {% endif %}