From ecacc41228e1f84ee07caf4a4501648885997994 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 26 Oct 2021 15:17:26 -0400 Subject: [PATCH] 2021-10-26 Fred Gleason * Fixed a regression in rdlogmanager(1) that broke editing of scheduler rules. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ rdlogmanager/edit_schedcoderules.cpp | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77fac2d0..5ca757d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22539,3 +22539,6 @@ 2021-10-26 Fred Gleason * Fixed a regression in rdmaint(8) that broke purging of expired cuts. +2021-10-26 Fred Gleason + * Fixed a regression in rdlogmanager(1) that broke editing of + scheduler rules. diff --git a/rdlogmanager/edit_schedcoderules.cpp b/rdlogmanager/edit_schedcoderules.cpp index f2a1f36b..032a7db8 100644 --- a/rdlogmanager/edit_schedcoderules.cpp +++ b/rdlogmanager/edit_schedcoderules.cpp @@ -126,13 +126,13 @@ int EditSchedCodeRules::exec(unsigned rule_id) edit_rule_id=rule_id; QString sql=QString("select ")+ - "`RULE_LINES.CODE`,"+ // 00 - "`SCHED_CODES.DESCRIPTION`,"+ // 01 - "`RULE_LINES.MAX_ROW`,"+ // 01 - "`RULE_LINES.MIN_WAIT`,"+ // 02 - "`RULE_LINES.NOT_AFTER`,"+ // 03 - "`RULE_LINES.OR_AFTER`,"+ // 04 - "`RULE_LINES.OR_AFTER_II` "+ // 05 + "`RULE_LINES`.`CODE`,"+ // 00 + "`SCHED_CODES`.`DESCRIPTION`,"+ // 01 + "`RULE_LINES`.`MAX_ROW`,"+ // 01 + "`RULE_LINES`.`MIN_WAIT`,"+ // 02 + "`RULE_LINES`.`NOT_AFTER`,"+ // 03 + "`RULE_LINES`.`OR_AFTER`,"+ // 04 + "`RULE_LINES`.`OR_AFTER_II` "+ // 05 "from `RULE_LINES` left join `SCHED_CODES` "+ "on `RULE_LINES`.`CODE`=`SCHED_CODES`.`CODE` "+ QString::asprintf("where `RULE_LINES`.`ID`=%u",rule_id);