Skip to content

Commit

Permalink
fix: use get_all instead of get_list
Browse files Browse the repository at this point in the history
- query report already filters records based on permissions for link fields

- allow employees access to leave balance report by default
  • Loading branch information
ruchamahabal committed Nov 17, 2023
1 parent eea7bbc commit 4b8ed0f
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 21 deletions.
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
{
"add_total_row": 0,
"apply_user_permissions": 1,
"creation": "2013-02-22 15:29:34",
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
"idx": 3,
"is_standard": "Yes",
"modified": "2017-02-24 20:18:04.317397",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee Leave Balance",
"owner": "Administrator",
"ref_doctype": "Employee",
"report_name": "Employee Leave Balance",
"report_type": "Script Report",
"add_total_row": 0,
"columns": [],
"creation": "2013-02-22 15:29:34",
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
"filters": [],
"idx": 3,
"is_standard": "Yes",
"letterhead": null,
"modified": "2023-11-17 13:28:40.669200",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee Leave Balance",
"owner": "Administrator",
"prepared_report": 0,
"ref_doctype": "Employee",
"report_name": "Employee Leave Balance",
"report_type": "Script Report",
"roles": [
{
"role": "HR User"
},
},
{
"role": "HR Manager"
},
{
"role": "Employee"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@ def get_columns() -> List[Dict]:


def get_data(filters: Filters) -> List:
leave_types = frappe.db.get_list("Leave Type", pluck="name", order_by="name")
leave_types = frappe.get_all("Leave Type", pluck="name", order_by="name")
conditions = get_conditions(filters)

user = frappe.session.user
department_approver_map = get_department_leave_approver_map(filters.department)

active_employees = frappe.get_list(
active_employees = frappe.get_all(
"Employee",
filters=conditions,
fields=["name", "employee_name", "department", "user_id", "leave_approver"],
)

precision = cint(frappe.db.get_single_value("System Settings", "float_precision", cache=True))
precision = cint(frappe.db.get_single_value("System Settings", "float_precision"))
consolidate_leave_types = len(active_employees) > 1 and filters.consolidate_leave_types
row = None

Expand Down Expand Up @@ -188,7 +188,7 @@ def get_conditions(filters: Filters) -> Dict:

def get_department_leave_approver_map(department: Optional[str] = None):
# get current department and all its child
department_list = frappe.get_list(
department_list = frappe.get_all(
"Department",
filters={"disabled": 0},
or_filters={"name": department, "parent_department": department},
Expand Down

0 comments on commit 4b8ed0f

Please sign in to comment.