vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] grid ellipsis and hourly, hourly_long in dormant events

Browse source
This commit is contained in:
Anand Doshi 2016-07-15 12:41:58 +05:30
parent 5b1e24c431
commit c84c2e6af6
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/public/js/frappe/form/grid.js
View file

@ -702,7 +702,7 @@ frappe.ui.form.GridRow = Class.extend({
});
$col.field_area = $('<div class="field-area"></div>').appendTo($col).toggle(false);
$col.static_area = $('<div class="static-area"></div>').appendTo($col).html(txt);
$col.static_area = $('<div class="static-area text-ellipsis"></div>').appendTo($col).html(txt);
$col.df = df;
$col.column_index = ci;
@ -1036,4 +1036,4 @@ frappe.ui.form.GridRowForm = Class.extend({
}
}, 500);
},
});
});

5
frappe/utils/scheduler.py
View file

@ -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):