Pārlūkot izejas kodu

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

version-14
Anand Doshi pirms 9 gadiem
vecāks
revīzija
c84c2e6af6
2 mainītis faili ar 6 papildinājumiem un 3 dzēšanām
  1. +2
    -2
      frappe/public/js/frappe/form/grid.js
  2. +4
    -1
      frappe/utils/scheduler.py

+ 2
- 2
frappe/public/js/frappe/form/grid.js Parādīt failu

@@ -702,7 +702,7 @@ frappe.ui.form.GridRow = Class.extend({
}); });


$col.field_area = $('<div class="field-area"></div>').appendTo($col).toggle(false); $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.df = df;
$col.column_index = ci; $col.column_index = ci;


@@ -1036,4 +1036,4 @@ frappe.ui.form.GridRowForm = Class.extend({
} }
}, 500); }, 500);
}, },
});
});

+ 4
- 1
frappe/utils/scheduler.py Parādīt failu

@@ -130,6 +130,9 @@ def enqueue_applicable_events(site, nowtime, last, queued_jobs=()):
trigger_if_enabled(site, "hourly") trigger_if_enabled(site, "hourly")
trigger_if_enabled(site, "hourly_long") trigger_if_enabled(site, "hourly_long")


if "all" not in enabled_events:
trigger(site, "all", queued_jobs)

trigger_if_enabled(site, "all") trigger_if_enabled(site, "all")


return out return out
@@ -272,7 +275,7 @@ def restrict_scheduler_events_if_dormant():
update_site_config('dormant', True) update_site_config('dormant', True)


def restrict_scheduler_events(*args, **kwargs): 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) frappe.db.set_global('enabled_scheduler_events', val)


def is_dormant(since = 345600): def is_dormant(since = 345600):


Notiek ielāde…
Atcelt
Saglabāt