Commit 496b29b3 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Implements #9172 - AutoCron: new colum 'autoGenerated', 'xId'

parent 9f399cc8
Pipeline #2376 passed with stages
in 3 minutes and 9 seconds
......@@ -8293,7 +8293,7 @@ to edit `AutoCron` jobs::
10 {
# Table header.
sql = SELECT CONCAT('p:{{pageAlias:T}}&form=cron') AS _pagen, 'id', 'Next run','Frequency','Comment',
'Last run','In progress', 'Status' FROM (SELECT 1) AS fake WHERE '{{form:SE}}'=''
'Last run','In progress', 'Status', 'Auto generated' FROM (SELECT 1) AS fake WHERE '{{form:SE}}'=''
head = <table class='table table-hover qfq-table-50'>
tail = </table>
rbeg = <thead><tr>
......@@ -8319,6 +8319,7 @@ to edit `AutoCron` jobs::
IF(c.lastrun=0,"", DATE_FORMAT(c.lastrun,"%d.%m.%y %H:%i:%s")), '</td><td>',
IF(c.inProgress=0,"", DATE_FORMAT(c.inProgress,"%d.%m.%y %H:%i:%s")), '</td><td>',
LEFT(c.laststatus,40) AS '_+pre', '</td><td>',
c.autoGenerated,
CONCAT('U:form=cron&r=', c.id) AS _paged, '</td></tr>'
FROM Cron AS c
ORDER BY c.id
......
......@@ -153,6 +153,12 @@ $UPDATE_ARRAY = array(
'19.7.2' => [
"ALTER TABLE `Form` CHANGE `forwardPage` `forwardPage` VARCHAR(511) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';",
],
'19.9.1' => [
"ALTER TABLE `Cron` ADD `xId` INT(11) NOT NULL DEFAULT 0 AFTER `grId`; ",
"ALTER TABLE `Cron` ADD `autoGenerated` ENUM('yes','no') NOT NULL DEFAULT 'no' AFTER `outputPattern`; ",
],
);
......
......@@ -595,6 +595,7 @@ CREATE TABLE IF NOT EXISTS `Cron`
(
`id` INT(11) NOT NULL AUTO_INCREMENT,
`grId` INT(11) NOT NULL,
`xId` INT(11) NOT NULL,
`type` ENUM ('mail', 'website') NOT NULL DEFAULT 'website',
`lastRun` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
`lastStatus` TEXT NOT NULL,
......@@ -608,6 +609,7 @@ CREATE TABLE IF NOT EXISTS `Cron`
`outputFile` VARCHAR(255) NOT NULL,
`outputMode` ENUM ('overwrite', 'append') NOT NULL DEFAULT 'append',
`outputPattern` VARCHAR(255) NOT NULL,
`autoGenerated` ENUM ('yes', 'no') NOT NULL DEFAULT 'no',
`modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP,
`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment