Merge branch 'version-15-hotfix' into fix-bank-rec-mach-total

frappe · Jan 9, 2025 · 09492fe · 09492fe
2 parents 8e2e4f0 + 72875c6
commit 09492fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git 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)

diff --git 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
-							}}
+							<div
+								v-html="
+									events.data[employee.name][day.date].weekly_off
+										? '<strong>WO</strong>'
+										: events.data[employee.name][day.date].description
+								"
+							></div>
 						</div>
 
 						<!-- Leave -->