From c84c2e6af6d33b2de875a6b362aecf44f1fdac17 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 15 Jul 2016 12:41:58 +0530 Subject: [PATCH] [fix] grid ellipsis and hourly, hourly_long in dormant events --- frappe/public/js/frappe/form/grid.js | 4 ++-- frappe/utils/scheduler.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 9528a3ee2d..05728e9c2a 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -702,7 +702,7 @@ frappe.ui.form.GridRow = Class.extend({ }); $col.field_area = $('
').appendTo($col).toggle(false); - $col.static_area = $('
').appendTo($col).html(txt); + $col.static_area = $('
').appendTo($col).html(txt); $col.df = df; $col.column_index = ci; @@ -1036,4 +1036,4 @@ frappe.ui.form.GridRowForm = Class.extend({ } }, 500); }, -}); \ No newline at end of file +}); diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index dbe89fabde..9ba78c3ab8 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -130,6 +130,9 @@ def enqueue_applicable_events(site, nowtime, last, queued_jobs=()): trigger_if_enabled(site, "hourly") trigger_if_enabled(site, "hourly_long") + if "all" not in enabled_events: + trigger(site, "all", queued_jobs) + trigger_if_enabled(site, "all") return out @@ -272,7 +275,7 @@ def restrict_scheduler_events_if_dormant(): update_site_config('dormant', True) def restrict_scheduler_events(*args, **kwargs): - val = json.dumps(["daily", "daily_long", "weekly", "weekly_long", "monthly", "monthly_long"]) + val = json.dumps(["hourly", "hourly_long", "daily", "daily_long", "weekly", "weekly_long", "monthly", "monthly_long"]) frappe.db.set_global('enabled_scheduler_events', val) def is_dormant(since = 345600):