From 1df50af017846bd2e8d0be289ca5c05b51a35ab2 Mon Sep 17 00:00:00 2001 From: UmakanthKaspa Date: Wed, 8 Jan 2025 13:38:38 +0530 Subject: [PATCH 1/2] fix: resolve html rendering issue for holidays in roster view (#2595) --- roster/src/components/MonthViewTable.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roster/src/components/MonthViewTable.vue b/roster/src/components/MonthViewTable.vue index ca3158c486..8d9a6ca33e 100644 --- a/roster/src/components/MonthViewTable.vue +++ b/roster/src/components/MonthViewTable.vue @@ -112,11 +112,13 @@ v-if="events.data?.[employee.name]?.[day.date]?.holiday" class="blocked-cell" > - {{ - events.data[employee.name][day.date].weekly_off - ? "WO" - : events.data[employee.name][day.date].description - }} +
From 25a90281cf5687c64783609d007a5a52bc8fca9b Mon Sep 17 00:00:00 2001 From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com> Date: Wed, 8 Jan 2025 14:24:58 +0530 Subject: [PATCH 2/2] fix: Breadcrumb Label for Non-Logged-In Users in Job Portal (#2439) Co-authored-by: Rucha Mahabal --- hrms/www/jobs/index.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hrms/www/jobs/index.py b/hrms/www/jobs/index.py index 54cf4e2910..f8f100f134 100644 --- a/hrms/www/jobs/index.py +++ b/hrms/www/jobs/index.py @@ -9,7 +9,10 @@ def get_context(context): context.no_cache = 1 - context.parents = [{"name": _("My Account"), "route": "/"}] + if frappe.session.user == "Guest": + context.parents = [{"name": _("Home"), "route": "/"}] + else: + context.parents = [{"name": _("My Account"), "route": "/me"}] context.body_class = "jobs-page" page_len = 20 filters, txt, sort, offset = get_filters_txt_sort_offset(page_len)