From 10b28bc2edd66dda10c43f3a6bc099e03ded86e7 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 20 Nov 2013 12:48:18 +0100 Subject: [PATCH 1/5] Fix #1568 : Scheduler timeouts --- lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php b/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php index 59a5c311e4..f724aae978 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php @@ -343,7 +343,9 @@ class TaskManager implements ControllerProviderInterface set_time_limit(0); ignore_user_abort(true); - $app['task-manager']->getSchedulerProcess()->run(); + $process = $app['task-manager']->getSchedulerProcess(); + $process->setTimeout(0); + $process->run(); return $app->json(array('success' => true)); } From be0815a9e07e1d7dc6882e69e83e4df252019129 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 20 Nov 2013 12:48:29 +0100 Subject: [PATCH 2/5] Fix typo --- lib/classes/module/console/checkExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/classes/module/console/checkExtension.php b/lib/classes/module/console/checkExtension.php index 74ae8bbaf5..326aa16434 100644 --- a/lib/classes/module/console/checkExtension.php +++ b/lib/classes/module/console/checkExtension.php @@ -296,7 +296,7 @@ class module_console_checkExtension extends Command $output->writeln( sprintf("Succes ! sbid=%d, rid=%d (%d spots)", $sbid, - $ret["results"][0]["rid"], + $h["results"][0]["rid"], count($h["results"][0]["spots"])) ); } else { From 17a23e0c4b3787b693d189dbb737c4af9ea943dd Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 20 Nov 2013 13:04:50 +0100 Subject: [PATCH 3/5] Update to symfony 2.3.7 --- composer.json | 2 +- composer.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index b272a16cb5..7891791d74 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "silex/silex" : "~1.0.0", "silex/web-profiler" : "~1.0.0", "swiftmailer/swiftmailer" : "~4.3.0", - "symfony/symfony" : "2.3.3", + "symfony/symfony" : "~2.3.7", "alchemy-fr/tcpdf-clone" : "~6.0", "themattharris/tmhoauth" : "~0.7", "twig/twig" : "~1.14, >=1.14.2", diff --git a/composer.lock b/composer.lock index 459f443815..f3ec99fa71 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "f75434de6657af7daaf97fc6c9f16494", + "hash": "c86f3d5cef410e011d14c7ac9749c11e", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -2671,16 +2671,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.3", + "version": "v2.3.7", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "17aefe6c8ec9462dbfb3ef092f54c4e853861810" + "reference": "2829b471871c2564228fe9f0832a0f928a8ffaa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/17aefe6c8ec9462dbfb3ef092f54c4e853861810", - "reference": "17aefe6c8ec9462dbfb3ef092f54c4e853861810", + "url": "https://api.github.com/repos/symfony/symfony/zipball/2829b471871c2564228fe9f0832a0f928a8ffaa1", + "reference": "2829b471871c2564228fe9f0832a0f928a8ffaa1", "shasum": "" }, "require": { @@ -2775,7 +2775,7 @@ "keywords": [ "framework" ], - "time": "2013-08-07 17:11:16" + "time": "2013-11-14 07:58:51" }, { "name": "themattharris/tmhoauth", From ce05724cd3aca63b18ce582564891ebd06411676 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 20 Nov 2013 13:54:55 +0100 Subject: [PATCH 4/5] Fix #1586 : jQuery UI error in thesaurus tab selection --- templates/web/prod/thesaurus.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/web/prod/thesaurus.js b/templates/web/prod/thesaurus.js index a52485908b..13d1074867 100644 --- a/templates/web/prod/thesaurus.js +++ b/templates/web/prod/thesaurus.js @@ -541,7 +541,7 @@ function C_MenuOption(menuItem, menu, option, parm) // set the content of the wizard $("#THPD_WIZARDS .wiz_1 .txt").html(msg); // ... and switch to the thesaurus tab - p4.thesau.tabs.tabs('active', 0); + p4.thesau.tabs.tabs('option', 'active', 0); thesauShowWizard("wiz_1", true); break; @@ -567,7 +567,7 @@ function C_MenuOption(menuItem, menu, option, parm) msg = $.sprintf('{{ messageMany |e }}', trees.C._selInfos.n); } - p4.thesau.tabs.tabs('active', 0); + p4.thesau.tabs.tabs('option', 'active', 0); // set the content of the wizard $("#THPD_WIZARDS .wiz_2 .txt").html(msg); From 3b7e0c9a30beac81697d92911b9ae5ed2923474f Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 20 Nov 2013 15:51:13 +0100 Subject: [PATCH 5/5] Bump to version 3.8.3-alpha.0 --- lib/Alchemy/Phrasea/Core/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index d56752d179..3213aa14ff 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core; */ class Version { - protected static $number = '3.8.2'; + protected static $number = '3.8.3-alpha.0'; protected static $name = 'Diplodocus'; public static function getNumber()