From b4851e1d7023150d057090e62759d7f313554798 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Mon, 19 Sep 2022 18:57:55 +0200 Subject: [PATCH 1/2] Fix for #2545 (Max task duration double entry "1hour") --- cps/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/admin.py b/cps/admin.py index b70beab5..89f72189 100755 --- a/cps/admin.py +++ b/cps/admin.py @@ -1310,7 +1310,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=.9))) + duration_field.append((n, format_timedelta(t, threshold=.97))) return render_title_template("schedule_edit.html", config=content, From 071d19b8b38974e4762285307f987d4657286bd9 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Tue, 20 Sep 2022 19:10:45 +0200 Subject: [PATCH 2/2] Fix for #2537 (Impossible to set Denied Column Value from user table) --- cps/static/js/table.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cps/static/js/table.js b/cps/static/js/table.js index 548ca8c4..a758b892 100644 --- a/cps/static/js/table.js +++ b/cps/static/js/table.js @@ -548,11 +548,11 @@ $(function() { }, }); - $("#user-table").on("click-cell.bs.table", function (field, value, row, $element) { + /*$("#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) {