From 4fc36cc19251a6c2e78068f48c87accdeada3d0d Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Mon, 5 Aug 2019 15:29:00 +0530 Subject: [PATCH] fix: Show "View full Log" only if there's any activity --- .../js/frappe/ui/toolbar/energy_points_notifications.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/energy_points_notifications.js b/frappe/public/js/frappe/ui/toolbar/energy_points_notifications.js index 6092241d05..5de5b7d894 100644 --- a/frappe/public/js/frappe/ui/toolbar/energy_points_notifications.js +++ b/frappe/public/js/frappe/ui/toolbar/energy_points_notifications.js @@ -92,6 +92,7 @@ frappe.ui.EnergyPointsNotifications = class { `; let body_html = ''; + let view_full_log_html = ''; if (this.dropdown_items.length) { let date_range= this.get_energy_points_date_range(this.dropdown_items[0].creation); @@ -105,12 +106,12 @@ frappe.ui.EnergyPointsNotifications = class { let item_html = this.get_dropdown_item_html(field); if (item_html) body_html += item_html; }); + view_full_log_html = `
  • ${__('View Full Log')}
  • `; } else { body_html += `
  • ${__('No activity')}
  • `; } - - let dropdown_html = header_html + body_html + - `
  • ${__('View Full Log')}
  • `; + let full_log_btn = `
  • ${__('View Full Log')}
  • `; + let dropdown_html = header_html + body_html + view_full_log_html; this.$dropdown_list.html(dropdown_html); } @@ -164,4 +165,4 @@ frappe.ui.EnergyPointsNotifications = class { return message_html; } -}; \ No newline at end of file +};