diff --git a/employee/cbv/disciplinary_actions.py b/employee/cbv/disciplinary_actions.py
index 5cc124548..f80f615e5 100644
--- a/employee/cbv/disciplinary_actions.py
+++ b/employee/cbv/disciplinary_actions.py
@@ -267,6 +267,10 @@ class DisciplinaryActionsDetailView(HorillaDetailedView):
(_("Description"), "description"),
]
+ cols = {
+ "description": 12,
+ }
+
action_method = "detail_actions"
model = DisciplinaryAction
@@ -276,3 +280,9 @@ class DisciplinaryActionsDetailView(HorillaDetailedView):
"subtitle": "",
"avatar": "get_avatar",
}
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ instance = context["object"]
+ instance.ordered_ids = context["instance_ids"]
+ return context
diff --git a/employee/templates/cbv/disciplinary_actions/detail_action.html b/employee/templates/cbv/disciplinary_actions/detail_action.html
index 7dc8b4143..6a219a3db 100644
--- a/employee/templates/cbv/disciplinary_actions/detail_action.html
+++ b/employee/templates/cbv/disciplinary_actions/detail_action.html
@@ -1,23 +1,44 @@
-{% load basefilters %}{% load i18n %}
- {% if perms.payroll.change_disciplinaryaction or perms.payroll.delete_disciplinaryaction %}
+{% load basefilters i18n %}
-
- {% if perms.payroll.change_disciplinaryaction %}
-
-
- {% endif %}
- {% if perms.payroll.delete_disciplinaryaction %}
-
- {% endif %}
-
+{% if perms.employee.change_disciplinaryaction or perms.employee.delete_disciplinaryaction %}
- {% endif %}
- {% if request.GET.deleted %}
-
- {% endif %}
+
+
+{% endif %}
+
+{% if request.GET.deleted %}
+
+{% endif %}
diff --git a/employee/templates/cbv/disciplinary_actions/employee_col.html b/employee/templates/cbv/disciplinary_actions/employee_col.html
index 21258fe34..82d4c5376 100644
--- a/employee/templates/cbv/disciplinary_actions/employee_col.html
+++ b/employee/templates/cbv/disciplinary_actions/employee_col.html
@@ -1,40 +1,66 @@
-{% load i18n %} {% load basefilters %}
-
-
+{% load i18n basefilters %}
-
- {{instance.employee_id.all|length}}
- {% if instance.employee_id.all|length > 1 %}
- {% trans "Employees" %}
- {% else %}
- {% trans "Employee" %}
- {% endif %}
-
-
- {% for emp in instance.employee_id.all %}
-
-
-
-

-
-
{{emp.get_full_name}}
-
- {% if perms.payroll.change_disciplinaryaction or perms.payroll.delete_disciplinaryaction %}
-
-
-
- {% else %}
-
- {% endif%}
-
- {% endfor %}
-
+
+
+
+
+ {{ instance.employee_id.all|length }}
+ {% if instance.employee_id.all|length == 1 %}
+ {% trans "Employee" %}
+ {% else %}
+ {% trans "Employees" %}
+ {% endif %}
+
+
+ {% for emp in instance.employee_id.all %}
+
+
+
+

+
+
{{emp.get_full_name}}
+
+ {% if perms.payroll.change_disciplinaryaction or perms.payroll.delete_disciplinaryaction %}
+
+
+
+ {% else %}
+
+ {% endif%}
+
+ {% endfor %}
+
+
+