2021-10-26 Fred Gleason <fredg@paravelsystems.com>

* Fixed a regression in rdlogmanager(1) that broke editing of
	scheduler rules.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-10-26 15:17:26 -04:00
parent 0321edb919
commit ecacc41228
2 changed files with 10 additions and 7 deletions

View File

@@ -22539,3 +22539,6 @@
2021-10-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdmaint(8) that broke purging of expired
cuts.
2021-10-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogmanager(1) that broke editing of
scheduler rules.

View File

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