From bbf5bc37afc92a20d35fe3d6e4d20439539debd4 Mon Sep 17 00:00:00 2001
From: Horilla <support@horilla.com>
Date: Wed, 15 Oct 2025 17:24:29 +0530
Subject: [PATCH] [UPDT] ASSET: Updated records per page, detail view column
 width and sort issue on employee in asset history

---
 asset/cbv/asset_history.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/asset/cbv/asset_history.py b/asset/cbv/asset_history.py
index 6f0ecd569..423b99088 100644
--- a/asset/cbv/asset_history.py
+++ b/asset/cbv/asset_history.py
@@ -51,21 +51,19 @@ class AssetHistorylistView(HorillaListView):
         (_("Return Status"), "return_status"),
     ]
 
-    records_per_page = 5
-
     sortby_mapping = [
         ("Asset", "asset_id__asset_name", "get_avatar"),
-        ("Employee", "assigned_to_employee_id"),
+        ("Employee", "assigned_to_employee_id__get_full_name"),
         ("Assigned Date", "assigned_date"),
         ("Returned Date", "return_date"),
     ]
 
     row_attrs = """
-                hx-get='{asset_detail_view}?instance_ids={ordered_ids}'
-                hx-target="#genericModalBody"
-                data-target="#genericModal"
-                data-toggle="oh-modal-toggle"
-                """
+        hx-get='{asset_detail_view}?instance_ids={ordered_ids}'
+        hx-target="#genericModalBody"
+        data-target="#genericModal"
+        data-toggle="oh-modal-toggle"
+    """
 
 
 @method_decorator(login_required, name="dispatch")
@@ -112,8 +110,10 @@ class AssetHistoryDetailView(HorillaDetailedView):
         (_("Returned Status"), "return_status"),
         (_("Allocated Date"), "assigned_date"),
         (_("Returned Date"), "return_date"),
-        (_("Asset"), "asset_id"),
         (_("Return Description"), "return_condition"),
         (_("Assign Condition Images"), "assign_condition_img", True),
         (_("Return Condition Images"), "return_condition_img", True),
     ]
+    cols = {
+        "return_condition": 12,
+    }