Skip to content

GitLab

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
Hide whitespace changes
Inline Side-by-side
Documentation/Manual.rst
View file @ 496b29b3
...@@ -8293,7 +8293,7 @@ to edit `AutoCron` jobs:: ...@@ -8293,7 +8293,7 @@ to edit `AutoCron` jobs::
10 { 10 {
# Table header. # Table header.
sql = SELECT CONCAT('p:{{pageAlias:T}}&form=cron') AS _pagen, 'id', 'Next run','Frequency','Comment', 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'> head = <table class='table table-hover qfq-table-50'>
tail = </table> tail = </table>
rbeg = <thead><tr> rbeg = <thead><tr>
...@@ -8319,6 +8319,7 @@ to edit `AutoCron` jobs:: ...@@ -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.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>', IF(c.inProgress=0,"", DATE_FORMAT(c.inProgress,"%d.%m.%y %H:%i:%s")), '</td><td>',
LEFT(c.laststatus,40) AS '_+pre', '</td><td>', LEFT(c.laststatus,40) AS '_+pre', '</td><td>',
c.autoGenerated,
CONCAT('U:form=cron&r=', c.id) AS _paged, '</td></tr>' CONCAT('U:form=cron&r=', c.id) AS _paged, '</td></tr>'
FROM Cron AS c FROM Cron AS c
ORDER BY c.id ORDER BY c.id
......
extension/Classes/Core/Database/DatabaseUpdateData.php
View file @ 496b29b3
...@@ -153,6 +153,12 @@ $UPDATE_ARRAY = array( ...@@ -153,6 +153,12 @@ $UPDATE_ARRAY = array(
'19.7.2' => [ '19.7.2' => [
"ALTER TABLE `Form` CHANGE `forwardPage` `forwardPage` VARCHAR(511) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';", "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`; ",
],
); );
......
extension/Classes/Sql/formEditor.sql
View file @ 496b29b3
...@@ -57,46 +57,46 @@ CREATE TABLE IF NOT EXISTS `Form` ...@@ -57,46 +57,46 @@ CREATE TABLE IF NOT EXISTS `Form`
CREATE TABLE IF NOT EXISTS `FormElement` CREATE TABLE IF NOT EXISTS `FormElement`
( (
`id` INT(11) NOT NULL AUTO_INCREMENT, `id` INT(11) NOT NULL AUTO_INCREMENT,
`formId` INT(11) NOT NULL, `formId` INT(11) NOT NULL,
`feIdContainer` INT(11) NOT NULL DEFAULT '0', `feIdContainer` INT(11) NOT NULL DEFAULT '0',
`dynamicUpdate` ENUM ('yes', 'no') NOT NULL DEFAULT 'no', `dynamicUpdate` ENUM ('yes', 'no') NOT NULL DEFAULT 'no',
`enabled` ENUM ('yes', 'no') NOT NULL DEFAULT 'yes', `enabled` ENUM ('yes', 'no') NOT NULL DEFAULT 'yes',
`name` VARCHAR(255) NOT NULL DEFAULT '', `name` VARCHAR(255) NOT NULL DEFAULT '',
`label` VARCHAR(511) NOT NULL DEFAULT '', `label` VARCHAR(511) NOT NULL DEFAULT '',
`mode` ENUM ('show', 'required', 'readonly', 'hidden') NOT NULL DEFAULT 'show', `mode` ENUM ('show', 'required', 'readonly', 'hidden') NOT NULL DEFAULT 'show',
`modeSql` TEXT NOT NULL, `modeSql` TEXT NOT NULL,
`class` ENUM ('native', 'action', 'container') NOT NULL DEFAULT 'native', `class` ENUM ('native', 'action', 'container') NOT NULL DEFAULT 'native',
`type` ENUM ('checkbox', 'date', 'datetime', 'dateJQW', 'datetimeJQW', 'extra', 'gridJQW', 'text', `type` ENUM ('checkbox', 'date', 'datetime', 'dateJQW', 'datetimeJQW', 'extra', 'gridJQW', 'text',
'editor', 'annotate', 'time', 'note', 'password', 'radio', 'select', 'subrecord', 'upload', 'editor', 'annotate', 'time', 'note', 'password', 'radio', 'select', 'subrecord', 'upload',
'annotate', 'imageCut', 'fieldset', 'pill', 'templateGroup', 'annotate', 'imageCut', 'fieldset', 'pill', 'templateGroup',
'beforeLoad', 'beforeSave', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterLoad', 'beforeLoad', 'beforeSave', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterLoad',
'afterSave', 'afterInsert', 'afterUpdate', 'afterDelete', 'sendMail', 'afterSave', 'afterInsert', 'afterUpdate', 'afterDelete', 'sendMail',
'paste') NOT NULL DEFAULT 'text', 'paste') NOT NULL DEFAULT 'text',
`subrecordOption` SET ('edit', 'delete', 'new') NOT NULL DEFAULT '', `subrecordOption` SET ('edit', 'delete', 'new') NOT NULL DEFAULT '',
`encode` ENUM ('none', 'specialchar') NOT NULL DEFAULT 'specialchar', `encode` ENUM ('none', 'specialchar') NOT NULL DEFAULT 'specialchar',
`checkType` ENUM ('auto', 'alnumx', 'digit', 'numerical', 'email', 'pattern', 'allbut', `checkType` ENUM ('auto', 'alnumx', 'digit', 'numerical', 'email', 'pattern', 'allbut',
'all') NOT NULL DEFAULT 'auto', 'all') NOT NULL DEFAULT 'auto',
`checkPattern` VARCHAR(255) NOT NULL DEFAULT '', `checkPattern` VARCHAR(255) NOT NULL DEFAULT '',
`onChange` VARCHAR(255) NOT NULL DEFAULT '', `onChange` VARCHAR(255) NOT NULL DEFAULT '',
`ord` INT(11) NOT NULL DEFAULT '0', `ord` INT(11) NOT NULL DEFAULT '0',
`tabindex` INT(11) NOT NULL DEFAULT '0', `tabindex` INT(11) NOT NULL DEFAULT '0',
`size` VARCHAR(255) NOT NULL DEFAULT '', `size` VARCHAR(255) NOT NULL DEFAULT '',
`maxLength` VARCHAR(255) NOT NULL DEFAULT '', `maxLength` VARCHAR(255) NOT NULL DEFAULT '',
`labelAlign` ENUM ('default', 'left', 'center', 'right') NOT NULL DEFAULT 'default', `labelAlign` ENUM ('default', 'left', 'center', 'right') NOT NULL DEFAULT 'default',
`bsLabelColumns` VARCHAR(255) NOT NULL DEFAULT '', `bsLabelColumns` VARCHAR(255) NOT NULL DEFAULT '',
`bsInputColumns` VARCHAR(255) NOT NULL DEFAULT '', `bsInputColumns` VARCHAR(255) NOT NULL DEFAULT '',
`bsNoteColumns` VARCHAR(255) NOT NULL DEFAULT '', `bsNoteColumns` VARCHAR(255) NOT NULL DEFAULT '',
`rowLabelInputNote` SET ('row', 'label', '/label', 'input', '/input', 'note', '/note', '/row') NOT NULL DEFAULT 'row,label,/label,input,/input,note,/note,/row', `rowLabelInputNote` SET ('row', 'label', '/label', 'input', '/input', 'note', '/note', '/row') NOT NULL DEFAULT 'row,label,/label,input,/input,note,/note,/row',
`note` TEXT NOT NULL, `note` TEXT NOT NULL,
`adminNote` TEXT NOT NULL, `adminNote` TEXT NOT NULL,
`tooltip` VARCHAR(255) NOT NULL DEFAULT '', `tooltip` VARCHAR(255) NOT NULL DEFAULT '',
`placeholder` VARCHAR(2048) NOT NULL DEFAULT '', `placeholder` VARCHAR(2048) NOT NULL DEFAULT '',
`value` TEXT NOT NULL, `value` TEXT NOT NULL,
...@@ -595,6 +595,7 @@ CREATE TABLE IF NOT EXISTS `Cron` ...@@ -595,6 +595,7 @@ CREATE TABLE IF NOT EXISTS `Cron`
( (
`id` INT(11) NOT NULL AUTO_INCREMENT, `id` INT(11) NOT NULL AUTO_INCREMENT,
`grId` INT(11) NOT NULL, `grId` INT(11) NOT NULL,
`xId` INT(11) NOT NULL,
`type` ENUM ('mail', 'website') NOT NULL DEFAULT 'website', `type` ENUM ('mail', 'website') NOT NULL DEFAULT 'website',
`lastRun` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `lastRun` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
`lastStatus` TEXT NOT NULL, `lastStatus` TEXT NOT NULL,
...@@ -608,6 +609,7 @@ CREATE TABLE IF NOT EXISTS `Cron` ...@@ -608,6 +609,7 @@ CREATE TABLE IF NOT EXISTS `Cron`
`outputFile` VARCHAR(255) NOT NULL, `outputFile` VARCHAR(255) NOT NULL,
`outputMode` ENUM ('overwrite', 'append') NOT NULL DEFAULT 'append', `outputMode` ENUM ('overwrite', 'append') NOT NULL DEFAULT 'append',
`outputPattern` VARCHAR(255) NOT NULL, `outputPattern` VARCHAR(255) NOT NULL,
`autoGenerated` ENUM ('yes', 'no') NOT NULL DEFAULT 'no',
`modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP, ON UPDATE CURRENT_TIMESTAMP,
`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
......
Markdown is supported
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