- {% if instance.asset_request_status == "Approved" %}
-
-
-
- {% else %}
-
-
-
+ {% if perms.asset.change_assetrequest or request.user.employee_get == instance.requested_employee_id %}
+ {% if instance.asset_request_status == "Approved" %}
+
+
+
+ {% else %}
+
+
+
+ {% endif %}
{% endif %}
-
- {% if instance.asset_request_status == "Approved" %}
-
-
-
- {% else %}
-
-
-
+ {% if perms.asset.delete_assetrequest %}
+ {% if instance.asset_request_status == "Approved" %}
+
+
+
+ {% else %}
+
+
+
+ {% endif %}
{% endif %}
diff --git a/base/cbv/company_leaves.py b/base/cbv/company_leaves.py
index 95ab80361..bc0c83d46 100644
--- a/base/cbv/company_leaves.py
+++ b/base/cbv/company_leaves.py
@@ -46,7 +46,7 @@ class CompanyleaveListView(HorillaListView):
self.search_url = reverse("company-leave-filter")
self.view_id = "companyleavedelete"
- if self.request.user.has_perm("base.view_companyleave"):
+ if self.request.user.has_perm("base.view_companyleaves"):
self.action_method = "company_leave_actions"
if self.request.user.has_perm("base.view_company"):
@@ -84,7 +84,7 @@ class CompanyLeaveNavView(HorillaNavView):
def __init__(self, **kwargs: Any) -> None:
super().__init__(**kwargs)
self.search_url = reverse("company-leave-filter")
- if self.request.user.has_perm("base.add_companyleave"):
+ if self.request.user.has_perm("base.add_companyleaves"):
self.create_attrs = f"""
hx-get="{reverse_lazy('company-leave-creation')}"
hx-target="#genericModalBody"
@@ -117,7 +117,6 @@ class CompanyLeaveDetailView(HorillaDetailedView):
@method_decorator(login_required, name="dispatch")
-@method_decorator(permission_required("base.add_companyleave"), name="dispatch")
class CompanyleaveFormView(HorillaFormView):
"""
form view for create button
diff --git a/base/cbv/holidays.py b/base/cbv/holidays.py
index f241b6cf8..82ee697d8 100644
--- a/base/cbv/holidays.py
+++ b/base/cbv/holidays.py
@@ -47,7 +47,9 @@ class HolidayListView(HorillaListView):
super().__init__(**kwargs)
self.search_url = reverse("holiday-filter")
self.view_id = "holidaydelete"
- if self.request.user.has_perm("base.add_holiday"):
+ if self.request.user.has_perm(
+ "base.change_holidays"
+ ) or self.request.user.has_perm("base.delete_holidays"):
self.action_method = "holidays_actions"
columns = [
@@ -84,7 +86,7 @@ class HolidayNavView(HorillaNavView):
def __init__(self, **kwargs: Any) -> None:
super().__init__(**kwargs)
self.search_url = reverse("holiday-filter")
- if self.request.user.has_perm("base.add_holiday"):
+ if self.request.user.has_perm("base.add_holidays"):
self.create_attrs = f"""
hx-get="{reverse_lazy('holiday-creation')}"
hx-target="#genericModalBody"
@@ -172,7 +174,6 @@ class HolidayExport(TemplateView):
@method_decorator(login_required, name="dispatch")
-@method_decorator(permission_required("leave.add_holidays"), name="dispatch")
class HolidayFormView(HorillaFormView):
"""
form view for create button
diff --git a/base/templates/cbv/company_leaves/company_leave_actions.html b/base/templates/cbv/company_leaves/company_leave_actions.html
index f205c6bfb..61ac1153f 100644
--- a/base/templates/cbv/company_leaves/company_leave_actions.html
+++ b/base/templates/cbv/company_leaves/company_leave_actions.html
@@ -1,12 +1,12 @@
{% load i18n static %}
-{% if perms.leave.change_companyleave or perms.leave.delete_companyleave %}
+{% if perms.base.change_companyleaves or perms.base.delete_companyleaves %}