tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8055-tareas-programadas-almacenadas-en-disco-rotas-fix-mr-48' into 'develop' 

Fix mr 48 breaking tasks

See merge request artica/pandorafms!4478
This commit is contained in:
Daniel Rodriguez 2021-10-22 09:58:57 +00:00
parent bcf8e8d647 a03e46ecea
commit 6e12e5363e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/extras/mr/48.sql
View File

@ -27,14 +27,15 @@ CREATE TABLE IF NOT EXISTS `tsync_queue` (
UPDATE `tlink` SET `link` = 'https://pandorafms.com/manual/' WHERE `id_link` = 0000000001;
UPDATE `tuser_task`
SET parameters='a:7:{i:0;a:7:{s:11:"description";s:30:"Template pending to be created";s:5:"table";s:16:"treport_template";s:8:"field_id";s:9:"id_report";s:10:"field_name";s:4:"name";s:8:"required";b:1;s:4:"type";s:3:"int";s:9:"acl_group";s:8:"id_group";}i:1;a:7:{s:11:"description";s:6:"Agents";s:5:"table";s:7:"tagente";s:8:"field_id";s:9:"id_agente";s:10:"field_name";s:6:"nombre";s:8:"multiple";b:1;s:4:"type";s:3:"int";s:9:"acl_group";s:8:"id_grupo";}i:2;a:2:{s:11:"description";s:16:"Report per agent";s:10:"select_two";b:1;}i:3;a:2:{s:11:"description";s:11:"Report name";s:4:"type";s:6:"string";}i:4;a:2:{s:11:"description";s:47:"Send to e-mail addresses (separated by a comma)";s:4:"type";s:4:"text";}i:5;a:2:{s:11:"description";s:7:"Subject";s:8:"optional";i:1;}i:6;a:3:{s:11:"description";s:7:"Message";s:4:"type";s:4:"text";s:8:"optional";i:1;}}i:7;a:2:{s:11:"description";s:11:"Report Type";s:4:"type";s:11:"report_type";}}'
WHERE id=2;
UPDATE `tuser_task_scheduled` SET
`args` = REPLACE (`args`, 'a:8', 'a:9'),
`args`= REPLACE(`args`, 's:15:"first_execution"', 'i:2;s:0:"";i:7;s:3:"PDF";s:15:"first_execution"')
WHERE `id_user_task` = 2;
UPDATE `tuser_task_scheduled` SET
`args`= REPLACE(`args`, 's:15:"first_execution"', 'i:8;s:3:"PDF";s:15:"first_execution"'),
`args` = REPLACE (`args`, 'a:8', 'a:10'),
`args` = REPLACE (`args`, 'i:6', 'i:7'),
`args` = REPLACE (`args`, 'i:5', 'i:6'),
`args` = REPLACE (`args`, 'i:4', 'i:5'),
`args` = REPLACE (`args`, 'i:3', 'i:4'),
`args` = REPLACE (`args`, 'i:2', 'i:2;s:0:"";i:3')
WHERE `id_user_task` IN (SELECT id from tuser_task WHERE function_name = 'cron_task_generate_report_by_template');
UPDATE `tconfig` SET `value` = 0 WHERE `token` = 'centralized_management';

2
pandora_console/include/functions_cron.php
View File

@ -595,7 +595,7 @@ function cron_list_table()
}
}
$report_type = $args[7];
$report_type = $args[8];
$report_per_agent = $args[3];
$report_name = $args[4];
$email = $args[5];