diff --git a/employee/models.py b/employee/models.py index 1bf784e7a..3f42b12b0 100644 --- a/employee/models.py +++ b/employee/models.py @@ -936,3 +936,4 @@ from accessibility.accessibility import ACCESSBILITY_FEATURE ACCESSBILITY_FEATURE.append(("gender_chart", "Can view Gender Chart")) ACCESSBILITY_FEATURE.append(("department_chart", "Can view Department Chart")) ACCESSBILITY_FEATURE.append(("employees_chart", "Can view Employees Chart")) +ACCESSBILITY_FEATURE.append(("employees_chart", "Can view Birthdays")) diff --git a/employee/views.py b/employee/views.py index 4b0c455a0..1aa253d43 100755 --- a/employee/views.py +++ b/employee/views.py @@ -176,16 +176,18 @@ filter_mapping = { def _check_reporting_manager(request, *args, **kwargs): - obj_id = kwargs["obj_id"] - emp = Employee.objects.get(id=obj_id) - re_manager = None - if emp.employee_work_info.reporting_manager_id != None: - re_manager = emp.employee_work_info.reporting_manager_id - employee = request.user.employee_get - if re_manager != None: - return re_manager == employee - else: - return False + if kwargs.get("obj_id"): + obj_id = kwargs["obj_id"] + emp = Employee.objects.get(id=obj_id) + re_manager = None + if emp.employee_work_info.reporting_manager_id != None: + re_manager = emp.employee_work_info.reporting_manager_id + employee = request.user.employee_get + if re_manager != None: + return re_manager == employee + else: + return False + return request.user.employee_get.reporting_manager.exists() # Create your views here. diff --git a/templates/dashboard.html b/templates/dashboard.html index 9f0e5f767..197f90aa5 100755 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -196,7 +196,9 @@
-
+ {% if 'employees_chart'|feature_is_accessible:request %} +
+ {% endif %}
{% trans "Announcements" %}