Merge branch 'master'

This commit is contained in:
Ozzie Isaacs 2022-09-20 19:11:30 +02:00
commit 0f67e57be4
2 changed files with 1 additions and 7 deletions

View File

@ -1320,7 +1320,7 @@ def edit_scheduledtasks():
time_field.append((n, format_time(datetime_time(hour=n), format="short",)))
for n in range(5, 65, 5):
t = timedelta(hours=n // 60, minutes=n % 60)
duration_field.append((n, format_timedelta(t, threshold=.95)))
duration_field.append((n, format_timedelta(t, threshold=.97)))
return render_title_template("schedule_edit.html",
config=content,

View File

@ -548,12 +548,6 @@ $(function() {
},
});
$("#user-table").on("click-cell.bs.table", function (field, value, row, $element) {
if (value === "denied_column_value") {
confirmDialog("btndeluser", "GeneralDeleteModal", $element.id, user_handle);
}
});
$("#user-table").on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table",
function (e, rowsAfter, rowsBefore) {
var rows = rowsAfter;